Safety for Tikka 300 WSM T3

[buck wild]

Ok I know there are quite a few gun nuts on here to say the least. I am not. I have a Tikka 300 WSM that I absolutely LOVE but the safety drives me nuts. It's one of those low profile side thumb push safeties. It is hard to disengage it forward but the biggest issue, is that is often "sticks" when going back into the safety position from fire. You think it's back to safety when in fact it hangs up and is still in fire. Best I can tell is it does this sometimes if the bolt isn't all the way down in the closed position but I can't be certain that's the whole cause. Recently this resulted in an AD. That was not fun. I also love the current trigger. I did a little research to try and find a toggle type safety for it but only came up with a JARD and there are some bad reviews on that.

Any other remedies you could suggest that doesn't require gunsmithing 401 knowledge?
Thanks