STA,
Your 9mm/.40 S&W dilemma is easily solved--buy a G23 and get an aftermarket 9mm barrel. Get both .40 mags and 9mm mags. Voila. You can carry/shoot whichever suits your fancy on any given day.
I've done exactly what I recommended to you and have no regrets so far.
https://www.24hourcampfire.com/ubbth...at_is_Wrong_With_Me_I_bought#Post8969818Good luck in making your decision! I hope you get a new gun!