i have a 2004 4 stroke and had water too ,thought i was screwed ,,,after talking to 2 pros they said 4 strokes will condensate a lot ,,,changed oil and been great for the last 1000 miles,,,,,,as fer the other ....check the obvious ,linkage ,fuel,spark plugs (1 foweld)??