Time for a in line sediment bulb? They will segregate water from Gas, at least they did pre-ethanol.