Hi john, i had a similar fault with a bmw last week and it was the H/P pump that was the trouble, when the pressure got to great the pump leaked internally and there was to much return, if you get the pump off and get it down to your local engine/diesel center they can test it for you. Hope that might be of help to you!!
Sam