Doesn't sound like you have any HP oil leaks at this point. The pump is probably fine too. What about aerated oil?

I would disable injectors one by one while holding engine speed above 1200 while watching ICP graph. Very simple and quick. May give you a new ... Login to read more.