Ayuh,.... What I did in that situation is got a Huge fuel filter, a 2ndary Mack full filter, holds 'bout 1/2 gallon,...
'n an electric fuel pump,...
I rigged to to pull from the tank's dip tube after I pulled the anti-siphon valve, into the Huge filter, to the electric pump, to a white 55 gallon drum,...
After it was the drum, I pump it out, 'n run it in my wood splitter, lawn mowers, 'n the ole lady's car(my pickup is diesel),...
So long as what I suck out is from the Top of the gas, 'n still smells like gas, it runs just Fine,...
Any water, 'n crud is gonna be at the bottom of the drum, just like in yer tank now,...
Another option I've done when dealin' with water in the tank is, run my transfer/ filterin' system, 'n skip the drum, pump it right back into the tank,...
That's the Beauty of the Huge Mack filter,....
It could be done with the regular canister type boat fuel filter, but ya might go through a couple of filters, to get the job done,...
Water, Will pass through a canister filter, it's limited by it's volume capacity,... Once Full, it passes water,...