Had those symptoms on a few hdi's in at work,on those it was the fuel pump that was breaking up and putting tiny bits of swarf into the common rail set up,there should be a tiny metal gauze on the back of the fuel pump,if there is swarf there,set fire to the car and run away!