[IronCanine]

I faced the exact same situation. Radiator guy couldn't get the original straightened out good enough...and to his credit he called the ball and didn't charge me. I got a new tank (from 1rippen btw) and swapped the neck. It came out great. I used the original straps which cleaned up nicely. I had a local machine shop reproduce the square u-bolt which was trash and had to be cut out on disassembly. We did line the new tank. The radiator guy had kind of gotten into the project (he did my radiator re-core as well) and painted the tank with some "galvanized" paint to homogenize it after neck swap. That didn't look too good, so we repainted it. Here are a few pics.