When you put everything back together use some non-conductive dielectric grease on those plugs, it will help to keep out the water

Wire brush and clean your grounds too, hopefully you find something chaffed/worn or broken where you think it is, but ultimately wiring like to break at the ends points not so much in the middle of a wire harness