I bought what to me then was a very beautiful kilt pin several years ago, but it had a number of edges (thistle-flower-and-leaf with claymore) which seemed to snag on many things. The attaching pin was pretty wimpy, easily bent, so I decided that it was actually more a brooch that could be worn as a kilt pin. I took the pin to a local jeweler of some talent, and they replaced the wimpy attaching pin with a bit of heavier gauge piano wire which was looped at one end to fit the pin's fixture, and sharpened/pointed at the other. The gauge was such that the rotating catch still worked as well or perhaps better than it had with the wimpier-gauge original attaching pin.

We've had a couple of interesting experiences since then, and some repairs to the entire kilt pin were necessary when it was brushed loose from a kilt (and then stepped on), but it is now semi-permanenty affixed to the Paisley District tank that I own, and they are a good match!

Best of luck,
Mac