E,
I did what Sailgunner suggested & this serves me well. I am also NOT a lover of additives but, maybe you think about this:
#1 The water in your fuel got there by temp./seasonal changes causing condensation depending on your area & based on how much fuel is in your tank as opposed to air volume.
#2, possible water leaking from your deck fill port.
#3 which is mostly overlooked, is the quality of the fuel that you use. I do NOT fill up at fuel docks. I have a 22 gal. tank & jerry can my fuel to the boat. Look for major gas stations that have a high quality of diesel fuel. Take your jerry can & fill one gallon at each station until you find that sweet clear diesel.
#4 if your tank has never been inspected and/or cleaned, I would bet you have a 1/8" thk. or more of a grey pudding-like sludge on your tank bottom. Remove your dip tube & run a stick to the bottom & move it about. You will see the sludge on it when removed. This is the time for an inspection port and/or polishing.
I also removed the screen on my dip tube. My filters can better handle particulates than a clogged pick-up screen. If you've ever stalled when you needed the throttle, sludge buildup is the likely culprit.
Only use well-filtered fuel that looks like water & nothing with a brownish color. I have not had water problems the past ten years. I would also suggest to have a minimum 5" x 5" square inspection plate installed for adequate room to inspect & room for cleaning tools.
Baffled tanks my require two inspection ports. Personally, I am not real confident of fuel polishing for baffled tanks. That's just my take on it.
CR