the other thing is the idle control on the back of the pump.

remove the wire / clip next time the car is warm and idling and take note of the idle speed. I think its supposed to be around 650 rpm (someone correct me)

do some reading on those search terms and see if they help identify your problem.