You could also check the plug on the fuel rail pressure sensor, remove it, spray with contact cleaner and plug it back in. Mine started doing the same thing as yours and progressively got worse over time, to the point where it started doing all sorts of weird things ending up in limp mode...