Cloud,
I have the same motor. There is an adjustment screw on the shift lever, above the grease fitting. You need to loosen it, and play with the adjustment until it will stay in forward gear.
The pin on the lever that rides in the detents on the shift lock should travel pretty much the same...