First if you've been getting your fuel from one source that's had water within do you have other stations in your area you could try out?
I suggest a Dahl 100 or similar fuel filter/water separator so you'll have the ability to see how much water you're filling with.
Which fuel additives have you been using?
Where you at region wise? city/state area?