Has anyone checked the fuel trim numbers? I reckon you've got a vacuum leak somewhere after the throttlebody if the car is running lean on both fuel + gas.
Smoke test was done and 1 pipe replaced.
Error code relating to the fuel purge valve came up so we replaced that and the code hasn't come back
since doing both of those the car has started to run noticeably better.
Fuel trims are slightly different on Gas and petrol (although that is to be expected really), they are always positive however, which ties in with it running lean (its trying to add more fuel to compensate)
I have also had a code come up that one of the O2 sensors was switching too slowly.
Next step is to replace both upstream O2 sensors (these are in my car waiting to be fitted), if this doesn't cure the lean running, I'll try changing the MAF.
And also I have just bought a 2nd hand pump off ebay, going to try that and see if it stops the fuel draining back.
I tried to find out if there was a non-return valve somewhere but I think if there is, then its all part of the fuel pump assembly/sender unit, ie not available seperately