By "valve timing" I'm assuming you mean you've adjusted valve clearances? OM61x engines require it every 15,000 mi IIRC...valve guides/seals could be the next step.
Slow shutdown could be attributed to a vacuum leak; shutoff valve is vacuum-operated.

__________________
99 E300 TD -- sold
01 540i 6 spd