Sounds like a good mix of gear to me. I think I would keep the AR-7, a good 22 can be a valuable game getter and can have more range than a pistol. I have one of the Springfield M6 carbines in .410/22 Hornet. It offers some good game gathering options.
My main concern is to be able to get out of town in an emergency. I think that the way traffic is around here, I will be stuck in the city anyway. So, I keep bottled water, keep a water filter around and extra canned goods that can be cooked on a camp stove or gas BBQ. If the power ever goes out in the summer and stays out, survival will be a matter of staying cool and hydrated. For home defense, I keep a 40SW auto around and a few boxes of ammo. 12 guage is a backup tool to me, less manuverable. Anyway, you are doing good! Cheers!