I have fitted Golf headlights for the large (outer) pair on my 8v 'grale.
They are marginally bigger and required fabrication of mounting brackets etc but they look fine and are not noticably different from the standard units.
It has certainly been near impossible to source the original units for some years now.
I will try to post a photo if anyone is interested.