Go with what feels better.
Personally, I'd keep the G22. I have one and I love it. It's my daily CCW and bedside gun. It's not the most accurate pistol I own, but it's the one that I am the most comfortable with and has proven itself to be uber-reliable for me. It's accurate enough (5" 10rd groups at 25 yds), but my Taurus PT1911 is more accurate. That said, I'm not comfortable carrying a single action in condition 1. I'm sure it's perfectly safe, I'm just not comfortable with it. So I carry my G22.
I'm not a fan of S&W semi's, I just don't like they way they handle for me. I have no doubt that they are good guns, but they just don't fit me well...
Go with what's more comfortable for you, reliable for you, and accurate for you. Everybody has different tastes and prefrences for their SD/HD guns, pick the one that you are the most comfortable with.
Good luck with whichever you choose. Either would be a fine choice IMO.