New fuel pump for 38 gallon tank upgrade. OEM or upgrade recommendations?

I'm starting to assemble parts to do the 38 gallon tank swap on my 2012 flex fuel 5.7. Going to replace the fuel pump while the tank is off and keep the original as a spare. Looking for any input on this: New OEM fuel pump vs. high end aftermarket, and if so what kind, and what add-ons, such as a wicking mat, would people recommend? What other parts should I replace as preventative maintenance while it's taken apart? I'm going to buy all new OEM parts, no junkyard fuel tanks, so no issues with corrosion or existing tank gunk to consider.

 

Why not the AM 46 gal?

 

I've been looking at the Transfer Flow hard, a little leery of how heavy it is, and how low it looks like it hangs. Truck already has the Tundra lean pretty bad. Definitely still considering it, but haven't seen one in person to influence my decision. Is the AM a different tank then the TF?

 

Ah! AM, just abbreviated aftermarket for TF. Good luck!