+1 for the Racor. I don't know if the 40hp will take it, but there is a retro fit water separating filter kit for the Etecs which fits under the cowl & plugs into the EMM to give you an alarm if water is detected in the fuel. In theory the alarm goes off before the water gets to the engine. I have the Racors in the console at the fuel tank end & the BRP ones at the engine end, belt & braces.
Rule#2: Never argue with an idiot. He'll drag you down to his level & then beat you with experience.
Rule#3: Tha' can't educate pork.
Rule#4: See rule#5