If you want to troubleshoot your problem put a clear section of hose (temporarly) on both the input and output of the fuel head and look for air bubbles. I suspect you'll see them on the INPUT of the filter. If you put on a lift pump it should be as low as possible in the system. I choose an intank Cummins pump. It cured my problems that are similiar to yours. Some claim it's only a band-aid fix that covers the problem. The real problem in my mind getting the dealer to go further then "can not duplicate"
Early on in the product life of the US CRD's some dealers cured the problem by replacing the fuel lines from the tank. But step one was convincing my dealer there was really a problem with my brand new CRD that first occured on my very first mile of ownership
I sure dislike buying new vehicles and paying new vehicle prices for that simple reason

I much prefer buying a spotless 00 XJ Classic for $4k with no warranty at all like I did last Feburary and taking care of problems myself

I now have a fantastic ready for the wife to go anywhere XJ for a total of under $5k