Given that apparently Marwi has gone out of business and my headlights need some servicing, does anyone know of a good source for connectors that form a waterproof seal when put together?

I need to have the wiring on my two Marwi headlights replaced, and being as the current connectors were made one with the wire they are not reusable. What I'm planning on doing is having the connectors on the lights, batteries and chargers all replaced. And for the lights/batteries considering that they'll be on the bike and there'll be times when I'm riding out in the rain I don't need water getting into the connectors and causing a short. Sadly it doesn't appear that Radio Shack carries any as I've already asked there.

Thank you in advance for any and all help.