Before you start your engine again you REALLY NEED to make certain that the timing chain is how it should be. If it is as slack as you say you are in danger of repeating your previous problem of pistons hitting pre-chambers(?) and valves...

If you don't fancy letting the dealer see the car and nobody on the forum can help I'd talk to some other diesel mechanic - think trucks / buses / tractors. Not ideal but seriously has to be better than the guy who built it (if he is as bad as you say).

__________________
1992 W201 190E 1.8 171,000 km - Daily driver
1981 W123 300D ~ 100,000 miles / 160,000 km - project car stripped to the bone
1965 Land Rover Series 2a Station Wagon CIS recovery therapy!
1961 Volvo PV544 Bare metal rat rod-ish thing

I'm here to chat about cars and to help others - I'm not here "to always be right" like an internet warrior



Don't leave that there - I'll take it to bits!