There was a bosch spare parts shop behind japan auto parts, they had bosch 8 inch flat face headlamps with bulbs, priced about same as scrap market.
If shop is there, try your luck.
They had rhd lamps and also lots of dash panel gauges too, also sold cups for the gauges to install externally. Including rpm meter etc tiny 2 inch gauges.