Take it to a local frame maker and have them fix it. Should not require replacing the head tube or repaint unless the paint is brittle. 100-150 is my estimate. With the troubles you have had it makes no sense to me to go back to the maker for a solution.