I believe it could be the fuel pump as well but in a different way then not giving enough pressure. I had a similar issue where the car was intermittent and I got to the point where I kept the rear seat lifted and smacked the top of the cover to the pump to straighten it out because I thought that was the issue. I finally broke down one night near my buddy's house, who happens to be a master BMW mechanic, and he had nothing but a flashlight and a screwdriver and found the problem within a couple of minutes. I had to replace the whole unit not just the pump itself because it was the housing with the electrical connection that was the problem....not the pump itself.. Just my .02
Cheers,
~Ralph