Would it be better to buy a new fuel tank or fuel pump?
Hmm...before shelling out cash for a new fuel tank, I would make sure that I have correctly diagnosed exactly what the problem I'm trying to solve is.
Taking a step back, you have some performance symptoms...how do you make the leap (cause and effect) from those symptoms to the solution being replacing the fuel tank? Are there measurements you can take to help in the correct diagnosis and rule out/in certain causal relationships? And once diagnosed as best you can, can you use the current tank and just fix it?