I would bet con the vacuum trouble.

My previous 300TD had problems shifting hard and it turned out be vacuum related.

The problem is that they are hard to pinpoint and requires the right tools and lots of patience.

A. Rosich
S320, 1998
E320T, 1995