Consider a third. One for the indoors problems, the second for any new ones you may face outdoors. The third is the one you have to get home with, or to use to repel boarders once you get to your vehicle.
I've found ankle rigs for extra magazines to be even more useful than those for hideout guns. BTW, when I'm carrying my old Browning GP, I carry four mags with it. Two go VERY nicely in a GI First Aid Pouch, which can be snapped onto almost any belt or holster strap.
My biggest issue is that here in South Texas, I have to carry a murse (as my daughters call my CC bag) because wearing a jacket to conceal a shoulder holster just gets too hot. I have one of the IWB cross-hand-draw holsters, but it just looks like I’m packin’ (and not in the “I’ve got a gun” way). Maybe just a smaller carry piece. I’ve looked at some of the Kel-Tec line, but they really look like peashooters. Any suggestions?
Colonel, USAFR