man I remember when my super s looked like that :D
Sounds like a good project you've got going. Your fuel filler leak is usual fault, for the very reason you've found, it's designed nicely to collect mud, salt, moisture etc all the good things to cause rust :)
You'll not stop using the dash...