IMHO.
before changing a bunch of stuff get an external electric (if that's your direction) and test it out to be sure it fixes your issue.
As mentioned earlier, be sure you have enough venting to the tank. Might even do some testing without the fuel cap on, just watch the corners.