Scrambler Headlamp Upgrades Anyone?

I think the performance of the headlamp on the early scramblers is well reported but I can’t find any information on anyone actually doing a meaningful upgrade. I’ve tried swapping to one of the nightbreaker type lamps but this makes little difference. The problems seem to arise from the lens rather than the bulb, all I ended up with was the same amount of randomly scattered light but just brighter. The lens just doesn’t focus or form any beam,
I’m interested to know if anyone has found an alternative headlamp unit as a straight transplant. I don’t really want to go down the LED lighting route,
I’ve read somewhere that Cibie do a unit which could be a straight replacement for the standard lamp but struggling to get any firm information

Anyone out there can assist ?