Had a similar issue with my Envoy. It was a crack in the Fuel Return Line. ( one of the three little hoses going into the top of the Fuel Pump.) Caused all kinds of problems. I would check all those little hoses while your down there. Good luck.