GE Cafe Refrigerator - Water won't shut off

I have a GE Cafe fridge (CVCP1RKBA SS), with water dispenser / ice maker. Ran into an issue where the water would not shut off. Problem was not the switch or the valve, but a broken tab on the dispenser flap, where the spring is attached. So I replaced the flap; also replaced the clear dispenser funnel that the flap and spring attach to (that cracked in the process of fixing the flap the first time around). Reassembled.

Now, the water dispenser gets stuck "on", unless you pull back gently on the flap. Seems like the spring is not pushing the flap back far enough to disengage the switch. Tolerance between on and off is really tight. Thoughts on what the issue is? Is there a way to fix it?

Other than the flap engage issue, water dispenses fine, and ice maker is working fine.