To be honest, I've messages a few gearbox places and getting quotes for reconditioning the box, starting to figure that while it's off the car if I can get everything done like differential bolts and release arm etc. then I can re-fit it worry free. The GTI bottom end is still too fresh to worry about (126,000 miles) and the cylinder head will need a light skim and a clean up of the ports and that'll be enough, although if I can find a place that'll port the head and manifolds for a good price I may as well, just for the hell of it... Old school tuning FTW!