What I did was split the lights, so use the plug/bulb and 'back' half from your standard unit, then the glass/front from GTI ones. Never ever had an issue, you could always put a bead of silicon around where they join as it is hidden.
I know others did this too.