Long story short, its a nightmare - I can't get hold of a decent set of OE style lights at all, just cheap aftermarket ones which are even out of stock as of the past few weeks.
Gave up and looked for aftermarket lights like the angel eye and drl's and only ones that I can find are for LHD only.
So currently its stick with the old and clean/polish them.. but I really want new ones considering the entire rest of the car has new bits..

PS - People will do a quick google and say you can get them, I have emailed about 10 suppliers and they all don't actually have the physical stock - and the one that "did" sent me a damaged wrong light, and then once returned promptly stuck it back on eBay as a genuine perfect one..

Also tried VW, VW heritage, parts specialists, owners clubs for VW, eBay, Amazon, Euros, Motorserv, Beds Battery, National, Car parts for less (they have one side)...