cabriolet dx engine into tintop

Hi All, I'm thinking of ditching the 2.0l bottom end conversion i was doing and repairing it on the side. Iwould like to make the mk1 show on  the weekend, ive seen a cabriolet  dx engine, I was wondering is it a direct swap with the gti dx engine in the tintop?

Is the oil filter mount different?

Yep it should be a straight swap, there is 2 different oil coolers one is air feed and one is water, cabriolets have a water cooled oil.
What year is your tin top and what year is the cabriolet ?

What gearbox are you using, the one from the cabriolet or your tin top one?