Broken M&P .22 compact TS spring

[CCT125US]

Thumb safety spring gave out after 1500 rounds. I noticed a decreasing resistance during the final 5 mags of use. Within it's lifespan, I estimate the thumb safety was worked 1000 times. I have an RMA coming from S&W, but the CS has been underwhelming. Gun still works just fine and has the drop safety on the trigger, i just prefer to have all safeties working. My question is, has anyone detail stripped a .22C? Would that be a common spring and easy to source? Part of me wants to give Smith a chance, but I also want it fixed sooner rather than later.

[BN]

The 22 Compact is a hammer fired gun, not a striker gun. I wouldn't trust it without a working safety.

I've had decent turnaround time with S&W CS. It's been a while and I don't remember exactly how long, but not enough to irritate me.