Ha ha ha Welcome to my life.
Exactly the same problem. replaced just about everything I could, may as well have bought a new engine. Last thing I replaced was the Fuel Rail Sensor and that seems to have sorted the hiccup so far, but have noticed that there's a substantial fuel leak going on...