Probably: yes. If you have a good frame builder/repairist in your area and budget for that then let the experts have at it, otherwise...get the 2x4s and consult with the late great Sheldon Brown and this will definitely take many passes to get 'right' again.