If the 617 linkage is anything like my 616, take a look at where the horizontal rod from the firewall engages the linkage bracket on the engine.
The end of the rod [which may be one of a few configurations] should have some sort of bushing where it engages the engine bracket. On my 81 the bushing was gone and there was excessive slop in the linkage,
I jury rigged a bushing using popsicle sticks and duct tape [still on].
It solved the problem

__________________
1981 240D 143k 4 spd manual -SOLD

2004 VW Jetta TDI 5 speed 300k -still driven daily