I don't know if you ever got this situation fixed but I had the same issue last year. Finally switched out my fuel pressure regulator and that did the trick.