I ended up deciding to replace all the fuel system in favor of cleaning the tank and blowing out the lines. It was going to cost $100 to clean and re-line the tank, might as well spend $30 more and get a brand new tank. So I went with OPG stuff, actually ordered it through Summit. Got the tank, sending unit, lock ring with gasket, new straps and bolts. Next I need to get under there and drain everything, then go grab some new line from the parts store. Guess I'm going to need a line bending tool as well.