Headlight issues

I had planned to MOT my 110 tomorrow but have run up against an issue. I recently removed a bunch of spaghetti that the previous owner had left from a bodged fog light installation. So I now have one headlight working and no clue what has happened to the off side dip and main beam.

I also discovered the rears have corroded out of the headlight mounts so I intend to order new headlights and back units.

Now the MOT is on hold I plan to boost the power to the lights with a new harness. Has anyone done this and do you have any tips?

Fit an additional earth lead between the engine block and the earth point for the lights. If you have a soldering iron, solder the wires into the connectors, fewer problems in the future.

I've got a Boomslang headlight loom which I bought months ago... I need to fit it now the nights are drawing in!
These links might give a few pointers:
http://www.defender2.net/forum/topic26097.html?highlight=landreiziger
http://www.defender2.net/forum/topic32094.html