Sounds like you hit them all. You might want to change the fuel pressure regulator before changing the fuel pump, however, the regulator could be bad and not allowing the proper pressure to build up. Cheaper and less time consuming than a fuel pump. You might also want to check the egr circuit to make sure it is operating to spec. simply cleaning out the carbon may eliminate some of the problems. Just some thoughts.