Dear Graig and others,
I did my own diesel swap about 5 years ago, and the car and engine is still working in my sonīs hands.
However, it was a aspirated and non electronics diesel, which is a lot easier to manage. It took me 2 months with an experienced mechanic, and about 6 months more with my Mercedes mechanic to fix details.
I made a website of the swap:
https://sites.google.com/site/rd28engineswap/home
All details in costs, performance, difficulties are there.
You should document yr swap as it will be very useful to others.
Best,
Old Beaver