which efi fuel tank?

So today i went to drive my car today and the fuel leak issue i "fixed" decided to return as soon as i filled my car. :banghead: So, i'm done trying to put lipstick on a 40yr old pig, i need to fix this fuel system.

I found a two options online:
http://www.hotrodcitygarage.com/tanks.html

Then this one:


I'm not sure of the cost of either. Are there other options?? I was thinking of a fuel cell, but because my car is a fold down seat car, i'd need to build a firewall and i wouldn't be able to use the stock gas filler when i'm at the pump.