I ditched the mechanical pump for an Aeromotive stealth tank with a 340LPH pump. It required a return style regulator setup with my particular fuel system. They make A, B and E body tanks.
We made the spacer for the tank to help with any vibration. It wasn't 100% necessary.