I'd go with the "two piece" shaft and spring if you can arrange it.
_________________________
Drive fast, Play it loud!!!
20GB Original Blue Lens MKIIa Rio SN 030102760, Blue Buttons.
20GB Original Green Lens MKIIa Rio SN 040103268 Grey Buttons.