My baby is all fixed and purring like a kitten (and with a little more power) again (has been for about over a week now) thanks to The Maddestman, he did the majority of the work. That includes scalding his hand... Ooops.
I'll start looking for a new fuel tank when I put the 1.6L in it, but for now it's running beautifully and I have a car again that uses hardly any fuel.
: