My Deisel Mechanic is knowledgeable , talented , and Psychotic ... a few years back had a similar fuel issue. Fuel (lift) pump was suspected villain. When he told me the problem he mentioned sourcing one in Vermont for like a hundred fifty bucks , I told him to buy and install it as the machine bought new has been very good to me. He insisted on taking the original one completely apart and inspecting it. Swore it looked fine and should work , re installed it and it it did NOT work. I told him again to order the new one and R & R. He said he wanted to take it all apart again. Again I said let's just buy the new one. He decided it was worth another try ... this time he found that a set of tiny plastic in line check valves that prevented fuel from running backwards had failed. He actually found them somewhere new outside of Germany , so the OE mechanical lift pump still runs today. Stubborn he is as well