I wouldnt replace the pump unless your having issues with it, but def do the filter.

and about your other thread with the 3.5MAF it will work and fit in your car, but you need software programmed for it.