Crickey, he's a brame man. The pump is a pain to get set up straight, and if there are other problems with the engine as well then I'm surprised it runs at all. I would recommend that the CPS is replaced just to rule it out. Its a lot easier to replace than the fuel pump.
Other sensors to watch out for are :
Coolant temperature sensor;
Air intake temperature sensor;
Needle lift sensor;
Mass air flow sensor.
I appear to be slightly mistaken, there is a MAP on this engine and its mounted on the bulk head, with a pipe connected to the turbo discharge port. I doubt this affects idle but put it down the list of possibles.
I'd check out all of these before touvhing the pump. Too late it seems....
Keep us posted on what you find.