I use a stainless Vaporworx tank from Rick's Tank. It uses a Gen V Camaro fuel pump module. Easier to plumb because there is no return line. Tank can run down to near empty without fuel starvation issues. Have about 50k miles on it.
https://rickstanks.com/product/vapor-series/