others things to check too are your vacuum pressure at the fpr, fuel pressure (of course), last time you changed spark plugs, wires, cap and rotor. to get into heavier diag, injector pulses, injectors opening and closing properly.
the water problem, every car has that. thats why the electrical is considered sealed and has all those rubber gaskets that you hate dealing with
I know a lot about cars. I can look at a car's headlights and tell you exactly which way it's coming