nealy: not quite, you need to swap the friction plate to fit a MK3 2.0 gearbox as the input shaft is bigger

Don't put a diesel box in it, the ratios will be crap for your car. The 2.0 8v box has more relaxed ratios too, so it wont accellerate as well but be better for cruising!