In that case, check out the M&P Shield. Its very similar the the full size, just thinner and smaller. They even have a model without the thumb safety now as well.
I'm looking at a Sig 320 right now, it's modular design lets you choose what size you want to carry. I prefer the compact myself 15+1 to replace my single stack P225 as my carry gun.
Though not much difference, you might look at the XDS . It is smaller yet same features you're used to. The other choice for me would be the p938. Those two were what I narrowed down to when I was shopping for my first. Had my XDS for almost a year now & quite happy with my choice . JMHO
Didn't realize this was 2 months old. Probably made your choice by now.