If you are considering FI in the future you can save yourself a lot of hassle by also including baffling in the tank around the area of the pickup tube. I am not sure of the optimal design but I think you can go with short walls of sheet metal with small openings underneath that will allow fuel to run in and out at a rate slower than gasoline can slosh. I am currently running with a plastic home depot surge tank that I made out of a under-counter water filter housing. I was skeptical at first but it is designed to withstand much higher pressure and temperatures than I am using and there have been zero leaks. The main problem is how much space it takes up and the need for a lift pump. So if you are looking at FI in the future (a fun, exciting, and often times hair pulling adventure with a very steep learning curve) pull that tank and add a return fitting and baffling. I was able to use a bulkhead fitting on my tank for the return line which was doable with some drilling and tricky maneuvering through the sender hole.