I know you've just about ruled it out but speaking of gas tanks and fuel, the smart money these days is on replacing all rubber fuel lines with this new stuff that's supposed to work better with ethanol blend. I've heard of some fuel lines cracking after only a few months.
I know when it comes time for mine, I'm going that way.