---

Many times water in the fuel is a result of a bad clamp.

I would replace the all 3 hoses (vent, fill, supply) and the clamps first.

Hoses may look okay on the outside but degrade on the inside. Note that all new hose is alcohol resistant.