Check out the xd9 sub compact. 13+1 and very nice to conceal. Same gun so you wont change much and its just another polymer pistol!
I have a spare you can test if you like.

Or check out an XDM in 9mmthe if you want full size