Check your ground cables too. My old Sierra had some issues with running and starting rough that turned out to be just a ground cable that needed replaced.
Airtex always works great. I have a new one sitting on my floor as we speak.
Yes, better safe than sorry.Do get the whole pump or just the pump kit? Autozone has 2 different ones listed. Should I replace the fuel pump wiring harness along with the strainer?