If you prefer 1911 grip angle, XD.
If you shoot Glocks well, Glock.
The grip safety is a non issue, even in defensive situations. I’ve been shooting XD’s since before they were XD’s and have never had an issue.
Every sidearm that is to be carried in defense needs to be trained with, and training with a pistol includes gripping the gun properly. Remember that in a gunfight (be it against a bear or a human) only hits count, and making hits is a tough proposition if you are holding the pistol in a manner where the grip safety is not deployed.
The grip safety on XD’s is not the same as on a 1911, and even on 1991’s they get a bad rep from being poorly or improperly fitted.
Many will gripe about the grip safety, and lots of them will in the same breath tout a double action revolver of some huge caliber for the bear woods-news flash: ever try to limp wrist in a bad hold firing a Ruger Alaskan? The grip safety is way easier to not mess up and put rounds where you want them.
All that said, bottom line is it’s worth it to shoot both and invest in what you can make better hits with (even shooting same size models of different calibers, because finding 10mm of each you can shoot may be harder).
Sorry for the long post, but the anti-grip safety topic is usually knee jerk regurgitation. And if it’s that huge of a deal, grip safeties can be pinned (been done for decades).