I had (have) the water issue with my 330. New o-rings, all good gaskets, etc. I even covered the fill ports with taped down plastic bags to eliminate fill port intrusion. New fuel level sensors and gaskets. No gas smell anywhere. If I keep tanks full, 350 gallons, extra ton of weight, then...