Repinning works also, just put a washer on one side, that will usually center them. The warping is from stamping the tang IMO.