Well, it's done!

I've had a pretty productive day today. I threw in the relays, changed the switch from the floor to the column, changed from sealed beams to H4's, and added a kill switch (which is in plain sight and looks factory - very pleased

). And it all works!

Well, mostly...
First off, a few notes as to how I set it up. I used 6mm/50 Amp wire, with a 20A fuse on each side. I went with 20A as I figured that not all the wire was as robust or new as what I was adding. And I located the relays in the dash - before they go into the loom. This meant I had to run the two power lines from the solenoid back through the fire wall, but that was no real problem.
I have two problems, and a few observations. First, the observations. The new headlights I bought had Parkers inside them. I wanted to use them, as well as the parkers in the blinkers (roundie), but couldn't get the wires inside the buckets. I didn't really want to drill new holes...

And I've got to look at my light switch - the headlights come on at the first click, along with the parkers, and the headlights turn off (with the parkers left on) at the second click.

Finally, given all the talk about needing 5mm wire and big fuses, the wires through the bucket... They don't look like much more than 5A wire.
Now, my two problems. First, a pretty simple one. I've got to admit, I've never pulled a headlight before.

I had real issues getting the (outer) covers off (old rubber buckets), and now I can't get the LH one back on. Any tips..?
Secondly... And this is a bigger one... My RH high beam doesn't work.

I've tested, I've got 13.4V at the solenoid, and 12.3V at the light. That 12.3V is both from the Blue/White wire (High Beam power) to the body, and also to the earth wire (brown? It's pretty dirty - definitely not to the blue/red low beam wire). So, clearly, I've got voltage!

The High Beam was definitely working before adding the relay. It stopped working on the RH side when the relay was fitted. I've used pretty well exactly the schematic Jacob/Vulcan posted above, both lights are illuminated by one wire taken off one side of the relay (post 87 only), then split up at the front of the car (I found the joiner). So I'm reasonably confident the problem isn't the way I've wired it.
One time, when I left the High Beam on slightly longer (i.e. not just on and off to see if it's working), the RH side did f
licker on for a moment.

I know that the RH Sealed Beam wasn't blown before the relays were installed. I know that the H4 wasn't blown when it was installed, and a visual inspection of the bulb says it's still not blown.

I also tried the Sealed Beam from the LH side in the RH socket, again, no High Beam.

So I don't believe that the Lamp/Bulb is the problem. And I've got good voltage at the connector. Where else should I look..?
P.S. - does anyone know why f
licker, when not modified (italics, etc), triggers the swear filter like this - ******?