I did this repair at the weekend using the GSF Mk1 Golf part, its relatively straightforward. Ended up hacking about 6-7ins of the pipe along with the metal surround at the filling end (couldn't get the rubber seal thing on otherwise). However, the old fuel cap doesn't fit which is a bit of a blag ...