I think you already know your answer.
FWIW, the G30SF is without peer right out of the box. It's Glock simple and reliable, and the extra-thick magazine base pad makes it fit very comfortably in the hand (as opposed to the G29's thin base pad). The only downside is the OEM barrel has a generous feed ramp...and I do mean generous, like landing a Boeing 757 generous! This isn't an oversight on the part of Glock, they built the gun to chamber a 19,500 psi cartridge and within that parameter, the ACP easily survives lack of case head support, BUT if I were planning to pump up the volume I'd opt to install a barrel with less ramp exposure.
The XD has two advantages over the Glock. Grip and trigger ergonomics. For this it pays in having a high slide height. The Glock striker is only partially cocked, and the trigger take-up is finishing up that cocking just before left off. The reason is because the trigger bar rests atop a frame ledge that positively CANNOT allow the striker to release unless the trigger is pulled to the rear....a great system! The XD trigger is fully cocked by slide movement so of course the trigger has almost no take-up or movement before let-off, resulting in a short, more crisp feel. The downside is they had to add the grip safety to compensate for the internal safety ledge inside the Glock, but the end result is that when you are holding either pistol with a round chambered, it's live and ready to fire.
the real advantage to the Glock is that every part is available in the aftermarket including barrels, slides, connectors, triggers, safety systems etc., AND a Glock can be completely stripped to it's smallest component in seconds with the use of only a simple punch tool. The XD requires pulling out the hammer and punches just to get started.