It's time to do the basic, you didn't mention them :
Diesel purge and is the primary fuel filter (the clear plastic intake screen) actually ful of clear fuel or is there crud in there ? .
Since you have the delivery valve out, look down in the well with a good flashlight ~ is the fuel crystal clear of cloudy ? . I discovered cloudy fuel in my IP when I took the delivery valves out, the clear plastic screen was perfectly clear and clean, apparently my old IP had fungus growing in it .
Then it's time to test the ALDA and wastegate for ruptured diaphragms, I just discovered both were bad on my Coupe, it runs out fine but never exceeds 24MPG no matter what .
Easy to test both with a cheap vacuum pump .
Do things by the numbers and you'll find the problem sooner than later .
Expect lots of very good help from the folks here but don't skip over the basics as most problems are simple in the end, remember :
K.I.S.S. 
.