It could be the swirl flaps, but have you checked the FPR (Fuel Pressure Regulator). I believe these have a habit of misbehaving and were a Vauxhall recall along with the Siemens HP pumps which were replaced with the Continental type.
Fuel Pressure Regulator (with gasket) - GM Part # 95507060 (supersedes part # 24404015)