it is agood idea to connect a pressure gauge in the fuel line to see if your fuel pressure drops quickly when you switch off. I had exactly these symptoms, turned out to be the one way valve at the fuel pump, replaced it and all was well