Looks like you need to kill multiple birds with one stone.
Tank: Repair :( New :\ New upgrade :)
Pickup: Fabricate your own, buy new upgrade pickup, get the upgrade with the tank.
Pump: You really need to get your fuel system right before you look to blaming the pump. Ask yourself...
1. Does this pump exceed your fuel needs? Yes, you don't want to buy a fuel pump that just makes it. You want some in reserve.
2. What size is my line from the tank to the pump? 3/8" min, 1/2" is better. It should at least be the size of the inlet on the pump.
3. What pre pump filter are you running? WHat micron? What size are the inlet outlet of this filter?
4. WHat post pump filter are you running? What micron? What size is the inlet/outlet?
5. Depending on the pump you may or may not REQUIRE a return line however it is best to run one.
When mine began leaking from the front of the tank, perhaps around the pickup (which was too small anyway) I went with a new tank which included a new sending unit and pickup with a return fitting as well.
I'd get a new tank whether stock or an upgrade. And work your way through the rest of the checklist after that.
Here's mine.
