My 06 has been dying or not stay running and running rough or surging. I changed the crankshaft position sensor, camshaft position sensor, fuel injection pressure regulator, fuel rail pressure regulator sensor and fuel pump control module. The next step is the fuel pump and filter. I can't find an OEM fuel pump as they seem to be discontinued. What is the next best thing or where can I find one? I suppose I will be taking the tank out and cleaning it to do this. Any advice would be appreciated. Thanks