Have you considered the Aeromotive stealth fuel pump setup for your stock tank?