Pinion snubber idea
i have done both of these the spring and the snubber i thought the spring was more flexible but the snubber was easier when you wanted to eliminate quick but both worked well
Print