I aggree this sounds like a fuel delivery problem, and fuel pumps always seem to go out when the tank fills. I would brace the tank up with a floor jack and a wide board to protect the tank. lower it just enough to get access to the fuel lines at the top of the tank and disconnect the line, use ignition to pump out fuel (notice there is more than one, one will be the return). This will keep the fuel away from battery and starter...