I can see you are swapping manual to manual so its the easy way out. I swapped into the newest D1 I could find, a 99SD.
For others that are maybe swapping into an auto vehicle, make sure you get the 300tdi engine mounts in the right position based on putting the transfer case back exactly where it was with V8/ZF.
Also, if you get the RHD pedal cluster with the engine you can modify the original automatic cluster quite easily as finding a three pedal LHD cluster is quite difficult.
You seem to be where I was in May of 2010.
You can also rework the V8 a/c hoses and fit the V8 compressor on a special mount adaptor. I drive the compressor with the same belt that drives the water pump, ps pump, alternator etc but there is a trick to it.
My Lucas alternator died but I found a 100amp one from an early Saturn and swapped the pulleys. Even the tach reads right.
Good luck, Steve