Maichor,
If the sender is functioning, you should consider replacing the fuel pump with an aftermaket in-tank pump, like gratanelli, you can find them in the summit catalog for $125, and you could keep the tank.
I'm doing the same swap and intended to buy a fuel cell/pump/regulator setup, but that is close to $600.
Hope that helps..