Personally, the enjoyment of owning a nice collection of fine firearms aside, I don’t want any more guns and ammo than I can carry on foot. As an investment with an eye to selling to those with less foresight it might not be a bad idea. but bunkering is not appealing to me. I prefer to be mobile and you may not be able to depend on being able to drive.
Have you considered the possible advantage to buying 4 rifles and four handguns then caching three of each just outside your community. Should something happen to the other two such as confiscation, you won’t have to travel far before you are armed again.