Have you verified the lockout solenoid is working?
The surging while slowing down could be a bad spring in the actuator. In ski-me's picture, it would be that small grey spring. Do you trailer your boat a lot? I wouldn't imagine that spring would go bad in 2-3 years, but you never know.