Hi James...
Did you drop the engine in from the top or the bottom? I recently fitted the R32 engine into my mk1 and i struggled to get it in from the top. This was a first test fit, i would also like to neaten and probably shave the engine bay, but the way i struggled was terrible i knocked the bay a number of times.