I bought a used 2008 25 ESH a week ago and the pin in the dog clutch broke while in a test barrel of water. Got that fixed and had problems after installing foot to motor with it not shifting into F-N-R. I got it to shift into reverse and neutral, but not forward. I removed the shift handle from the tiller arm and cleaned and lubricated it. The plastic bushings look worn, so I greased them and reassembled. Upon further investigation the neutral safety was pushed out of the way. I guess the previous owner liked to crank in gear. I put the neutral safety switch in the correct position. The shift arm is sloppy on the end of the shift rod assembly. The shift arm looks like it was replaced with a different model year and the shift arm is boogerd up. The reason I say that is the arm is round on the part that engages the neutral safety. Yamaha parts diagram displays the shift arm with flat spots that engages the neutral safety switch. I don't think my problem is the shift rod to foot, or in the lower unit because I can shift thru the gears before installing to the motor. I install the lower unit in reverse with the barrel nut covering about half the threads. The shift rod cam does not look worn to me, but I have no way of comparing to a new one. The plunger on the end of the prop shaft looks good and the plunger spring is strong. Any thoughts or replies would be helpful. Thanks.