The "get unstuck" advice may be best - the Glock 9mms are great guns with a lot less recoil than the 40s/357s. I have the same carry set up as you, but as I get older, I'm liking my G26 more and more. I saw a Hickok45 video recently where he said he might start carrying the G26 - not because he's old, but because it shoots so damn well.
Maybe a 45? To me the G30 has less recoil than G23/G32. Or the 45 GAPs? I've rented, they shoot great, and the G39 recoil isn't bad.