Thanks for all the suggestions.
I bought all new Wipac holders and lenses, but I opted for old style bulbs for originality. Unfortunately, I’ve found them to be of fairly poor quality overall which is a shame.
Still, some standard LR fettling later and they’re all working now. I’ve used some...