You're right it was just the shift shaft. I got it apart last night and you could see it had a bend that was causing it to bind in the case and not let the ratcheting mechanism reset. Not sure if I explained that correctly but I'm sure you know what I mean.
As far as your spares I would love to use them. That is if you are not going to be using them at the same time ;)