If you like the P95, why not get one of those? I've had one for 8 years and thousands of rounds without issue.
I would normally suggest the G19, but it sounds like you aren't comfortable carrying it. I've carried glocks for a while, I've even pocket carried a G26 without a holster and I've never had an ND. But if you don't like it, you don't like it. An M&P can be had with an optional thumb safety and is as well respected as the glock.
I don't collect guns, I accumulate them.