I just got done doing a water pump removal/replacement on my 2005 Johnson 15hp 2-stroke and am having a slight problem now that everything is back together. I re-attached the shift linkage while both the motor and lower unit were in neutral. The motor is able to shift to forward, reverse, and neutral, but is occasionally having problems trying to engage the gears from neutral. If I spin the prop with my hand, then try shifting again, it'll catch. Do you guys think it is a problem with the lower unit or with the shifting assembly itself? I really don't want to drop the lower unit again if I don't have to...