It does sound like the gas tank has a part in this i.e. shorting.
I'd be inclined to insulate the tank by means of plastic builders bags and tape, if only to isolate the area.
If it runs fine while insulated you can be almost sure that the problem lies in the loom beneath the tank.
Let us know how you get on.