have u checked the fuel return pipe to see how much if any is returning to the pump?!

Sounds similar to my xr2i problem and that was down to the seals on the pump damper as 1 had split, tried loads of things till i realised it was that and never thought to check how much fuel was returning, which in my case was none due to poor pressure!