XD is a nice gun, but then just wait for the XDm in .45 ACP to come out!
As for a companion to the G19.... a) get what fits your hand. b) get a Glock. c) shoot it lots!!
I think the G19 could be one of the best CCW guns out there! I carry a G21SF/G30SF on-duty/off-duty with my G36 as backup. My G36 has affectionately been named Spanky! Duty rounds are Fed HST 230gr +P. Coming out of "Spanky" you tell the difference compared to our old Hydra-shoks!
I can same-hole drill with any of them at 20-25ft unrested and they're all flawless performers!
You said the G30 fits well in your hand, or was it the G30SF? Either way, another fine gun that other than width, about the same size as the G19(alas, not the same holsters!)
G36 however, would use same holster
Best of luck!!