In the past I have had pretty good luck with the local radiator shops. They can put just about any size tank in their vat and it comes out looking almost new.