I would say it's the tank as well. Can you put a temporary fuel tank(gas can)before the fuel pump and check to see if you get further than 2 blocks? just make sure you strap it in good. This will confirm it's the tank.

Fine print:
Must be 18 years or older, not liable for any fires or explosions!!! LOL