I have recently received a new 60 plate 2 litre TDi (I know it's not a GTi but I though posting in the GTi section would get more answers as the TDi section looks dead!)
Hello Mark and welcome to the MK6 section of the forum - you find the people on here pleasant, agreeable and welcoming regardless of the car you drive

The tdi section is new and more of a refuge at the mo.
Regards the bulbs I find PIAA are very good but there are also a number of us trying to work out an oem xenon solution asap.