In 9mm I’d go with a Sig of your choice or Browning Hi-Power, in 357mag I’d go with an L-frame S&W with a minimum of a 4 inch barrel. You might want to look at the 357Sig also.
I have a sig p229 and having served and used many handguns including Glock then the sig is by the best.