Not sure if this will help, but. The safety on mine was a bit finicky, i would sort of get stuck and such.
Early on I had decided to install a Rowan Engineering trigger, which I did. But upon assembly of all that, I could not get the safety to work at all. So I simply just left it out. I'm not sure that changing the trigger was a good idea, as the new one is beautiful, but either I don't know how to set it or what. It works, it just feels a little hard to pull, but it does break cleanly.
You could disassemble the whole thing and polish all the internals.