I also carry one with the thumb safety on. I have no trouble drawing and unlocking in one motion. Guess I'm used to it from carrying a 1911 locked an cocked. It just takes practice. I don't know of an aftermarket safety; maybe there is no market for one.