Get the XDm 40SW. 357SIG good for range or SD as reliability same as 40SW. XDm does not come stock in 357SIG, only the XD series. In XD you could strat with either cal as the outer barrel dimensions of the stock barrels are the same. 9mm need conversion barrel and dedicated mags, lighter recoil spring for best range reliability.
Do you shoot well enough to need the difference between match and a drop-in barrel? Probably 95% of shooters do not group well enough to find a difference (include me). If you can outshoot your barrel accuracy, you could also get a reasonable priced Storm Lake oversized barrel from Pistol Gear (their house brand) and have it fitted. True match grade chamber tolerances are too tight for reliable feeding with some normal commercial ammo. You will need to be very ammo selective. The slide to rail fit of the XD/XDm pistols is geared to reliability and are not target tight either.