Headlamp upgrades...what's the best H4 conversion?

Whilst having engine rebuilt and refurbishing the engine bay I want to upgrade the headlamps to a system that works at night whilst retaining the original look of the '87 90. I'm thinking a WIPAC or Hella conversion kit + uprated H4 bulbs [I like Osram Nightbreakers] + ceramic bulb holders.

Has anyone else discovered a really kit form that works well. I'm not adverse to an LED upgrade providing the correct type of lens is retained. I've used https://www.bettercarlighting.co.uk/ excellent LED's on some of my other cars.

Rgds
Andrew

Apparently, a boomslang loom makes a big difference.

I have fitted the Wipac Crystal lenses, combined with a Boomslang harness and upgraded bulbs they are a match for most modern cars headlights.

Thank you Mick, thank you zeaphod, this is the way to go. I've used similar individual relay looms before. They make a big difference and ensure no current seep, supply power to proper individual circuits and stop any risk of headlight switch burnout.

Same here, wipac crystals with osram nightbreakers combined with a boomslang loom. Massive improvement on standard but still retains original appearance.

We have used LED headlamp bulbs from Classic Car LEDS, they are a straight replacement, no changes to wiring required. Give out hugely more light and retains the original lenses