16710 GMT II stem not fully engaging

[TeddyBallGame]

Recently, when pulling the stem to wind or change the time on my 16710 it's having a tough time engaging into the right setting. It either doesn't want to go into the 2nd or 3rd position and I have to push it back in and try again (sometimes multiple times) or when it finally does work and I push it back to the winding position it will just spin freely and not wind. The watch was serviced a little over 2 years ago at a RSC and is still keeping great time but is just out of it's two year warranty. I'm wondering, if this is something minor that a good independent can fix or will it need a larger service?