Main Beam Flashing On

Hi All, I have had something happening a couple of times after heavy rain. As I am riding along my main beam will flash on and off randomly . I have come to the conclusion that this is water getting into the switch and momentarily making contact. It only happens if the lights are turned on and if I operate the pass switch repeatedly for several minutes it stops. My bike is a 900 sprint. As you can see from the pic I have a temporary fix while the bike is parked up but I could do with a better permanent solution. Thank you!