I agree i had a similar issue where i cleaned the plastic lock peace and took two winding off the spring that holds it in place and its been working great ever sense. It also looks like your diverter might need some readjustment as in the photo its not sitting far enough into the ramp.