I prefer the Kahr over the XD due to the concealability, but if its gonna be a house/car gun the added capacity of the XD would be a plus.
Personally, I'd keep the Kahr, but buy the XD anyway.
I'm not trying to sound like a jerk, but I just cant think of another way to say it. I cant imagine why the Kahr's limited capacity bothers you, yet the Kel-Tec you carry holds one less of a weaker round. While the Kel-Tec is very concealable, the Kahr shouldn't be much, if any, harder to conceal in the same attire. It would also be a good idea to have another concealable firearm if the Kel-Tec breaks.