patrick from BMA has also offered me the following for slightly less than the sum of all those parts.
4 X 25 11 1 220 439 SHIM
1 X 25 11 1 220 600 BUSHING
1 X 25 11 1 220 832 BUSHING, SHIFT LEVER
2 X 25 11 1 220 379 CLIPS
1 X 25 11 1 434 148 Z3 LEVER
which would get it short shift as well. I am wondering whether i can get away with the short shift kit to fix it up?