not sure about mk1 / mk2 gearbox differences but the 1.8 'box will not fit your 2.0 without a fair amount of work. The 1.8 has an ib5 'box and the 2.0 got the mtx75. As far as I know the gear change cables are different and the shafts are different so you'd need those too

Spud