Thanks for all the advice and offers lads, have the kit ordered from Cab now and this is basically what is needed for the refresh and the short shifter itself

For anybody looking into it:

1x 25-11-7-527-252 - Z3 shifter
1x 25-11-1-220-600 - Shifter bearing
4x 25-11-1-220-439 - Washers
2x 25-11-7-571-899 - Locking clamps
1x 23-41-1-466-134 - Shifter pin
1x 25-11-1-222-688 - Shifter joint
1x 25-11-7-519-669 - Bearing sleeve
1x 25-11-1-222-015 - Shifter bearing