I carry a G23 all the time. Glock makes a heck of a gun but I have to be honest, the XD does fit my hand better. I am going to be buying an XD .40 4inch model with the tax refund in the next week or two.
You will enjoy the Glock 30, and you definitely went about it the right way. You held both the guns you were considering and compared how they fit your hand and went with the one that worked best for you.
It will serve you well, now you just need to take the Wife to a nice dinner to say thank you!