yes it sounds like your getting water in some kind of module or wiring harness that controlls the engine, I would check all the areas under your hood any where you think the water could be flowing in to it, it does sound like the water is shorting something out