A combination of reduced drop rates (sometimes the gun a raider is using gets destroyed when the raider gets taken out), being able to store more than one gun per tile (so that armories don't get painfully large and take up too much real estate), and being able to melt down guns into a small amount of metal (if you don't want an armory, you don't have to have one) would solve the many-guns problem.
It would also make building a large armory somewhat challenging, so if a player enjoys collecting weaponry and displaying it, that's something they can try to do and actually be challenged on, as opposed to how it is now where it kinda happens easily.
It would also make building a large armory somewhat challenging, so if a player enjoys collecting weaponry and displaying it, that's something they can try to do and actually be challenged on, as opposed to how it is now where it kinda happens easily.