Im switching to the Atomic efi in the next month or so. Im going with the Aeromotive stealth tank with 200lph pump.its expensive, but no cutting, measurements, just put it in and plumb it with-6 hose.
My car also has been sitting for 19years and needs a new tank.