First thought are...The water you mention, give the coil and HT lead a spray with WD40, remive the ignition side cover and check its dry in there, a spray of WD40 in there too wond do any harm.
Next time it stops, open the fuel tank filler lid, does it suck in air...can you start it now? Could be a blocked tank vent.