Hey,
Mine went a few weeks back and I contacted this seller (Martyn) asking if he can source a GTI Version (1K6 945 097F). It's a non GTI in the listing but give him a shout he'll sort you out one from Germany at the same price. He's a helpful chap, plus received it within a few days.
http://m.ebay.co.uk/itm/252248982330Crack the old one out carefully, re install new one with a couple of dabs of silicone on the back to make sure it doesn't fall out. (It clips in but obviously you won't be able to screw in this one like the original was) solid as a rock now.
Oh and re direct your washer jet to the 2 o clock position.