Yeh sealed beam would sort it but are crap, had them as a nipper in Minis, fitted the H4 for that reason and yes the spots on the bar also fill up with water and those are Landrover ones.
Trouble is will have to change them out for the MOT later as no doubt the tester will say below light out put etc
Maybe roof mount is the way to go.
Doing this tend to fill them up, done it a couple of times!