while you have the top cover off, heres a job for you. get some emery paper and lightly sand the detent spring channels and keep trying the plungers in the casing for fit these should be a nice fine sliding fit.
also do not tighten the top cover fully or you will crush the casing and nipping the detent bearings.
doing this will make the fitting easier and will change gear better
hope this helps
moggs