I got a 12-gun safe five years ago thinking that'd be plenty. I'm now stacking guns on top of each other and it is time for a bigger safe but man they're expensive. How big is your safe?
I bought a safe that was bigger than I thought I needed, and I still filled it up. If you buy a new safe, get one that's bigger than you think you need right now.
Safes are always big until you start putting things in them. Also, the numbers lie I never get that many in there. Personally have a few but the big one is I think a 64 or something along those lines