E30 Touring M52 Swap

So after deciding that I'd rather keep an E30 touring than a sedan long term, I set out to look for one. Ended up getting the 320i that had been for sale in Wellington since the start of the year. It seemed in reasonable shape, with no leaks (water into the car), fairly straight, and aside from the rust in the tailgate, there was no other rust in the normal E30 places, so it sounded like a good buy (with well looked after touring being hard to find), and being manual, would be easy enough to s

I'm using an M42 Getrag 240 with a manual 320i driveshaft, and it's probably about 20mm too long, even after collapsing the driveshaft to the shortest it can. Trying to get it all jointed together and I can't seem to get the driveshaft to bolt up to the gearbox correctly. I can JUST get it into the guibo if I drop the gearbox, and then bolt up the centre bearing. But then the gearbox gets pushed on an angle, and won't come straight. I think it may be that the diff has been swapped from a sma