Congrats on the Super, looks to be in pretty good shape! I hope you can get your issues straightened out fairly easily. One thing I will say is while it's apart, make sure you:
Replace all your fuel line, not just the pump
Put new grommets in the fuel tank, less than $5 for both
Clean and repack the drive shaft CV's with grease, as well as the CV on the steering column
Those are just a couple of the more important basics. Good luck, and keep us posted!!
