2000 berlina outer headlamps - where?

[Lo Fo SI]

Both of our 2000 berlinas have outer headlamps that will not get through their next inspection due to rusting / discolouring of the reflectors. Replacement Carellos from the usual sources seem to be made from unobtainium at the moment.
Has anyone got a source for RHD outers? Or is it possible to fit a different 53/4 headlight assembly - Wipac look like they do something that may work but it would mean replacing the complete bucket also it's not obvious if the clips for the trim are correct and you would loose the angle adjuster

Simon