I use thick leather straps made by Heistercamp in England and Richter in Germany, but there are lots of fine US strap makers that'll do this, too:
I have the straps made with the buttonholes a little longer, about one inch instead of whatever the standard length is. This makes it very easy to get the straps over the buttons. I tuck one edge of the button slot under one side of the strap button, and then tuck the other side over. Pull the strap a little to fully engage the button, and you're in business. Doesn't take any longer than using a standard button.
The idea to use a one inch button slot came from measuring one of PRS' soft leather straps from a few years ago. It was about a one inch length.
There's no need to use strap locks, and if the leather's sturdy (the above strap makers use excellent leathers), the strap won't come off unless you're doing acrobatics with the guitar on. I have both PS and Core models, and I don't worry about my guitars when using the stock buttons.
You might be able to lengthen the buttonhole slots on your current straps; if they're too valuable to risk monkeying around with, any competent shoe or leather repair person should be able to do it.
Note: If you decide to look at the Heistercamp stuff, their standard straps are thicker than the distance between the top of the button and the guitar, i.e., too thick to use with the stock strap buttons. However, their Super-Soft straps will fit, and FYI, they're not soft and mushy straps, they're pretty darn thick and firm. These are the only straps I buy nowadays for my guitars, though I also like the Richter Spring Break straps.