If it's not the CPS it could also be the Inlet Metering Valve on the back of the pump. They can also give the same symptoms.

A pukka Delphi specialist has a kit to test whether the IMV is faulty or not.