Well my stock tank's return line is corroded, now busted off, so it's time to replace the tank. Any suggestions as to the cheapest fuel cell and where to get it?

I know, you shouldn't put a price on safety, but honestly the main reason I'm looking at a fuel cell instead of a stock replacement is to get some sort of baffling and/or foam to keep the gas next to the pick up.

Also I do not see myself moving to production in the foreseeable future so suggestions on not FIA-FT3 rate cells are welcome.

Thanks