I had this very same issue. It was fuel related. Just a lot of air in the lines. The diesel purge is a great place to start. It's the only fix in a bottle that I've ever seen work.

Now, I know I'll go on Hell's worst offender list for this, but a VERY limited use of starting fluid does work.