If I were you, I'd start setting up coolerdors. You only need about five 120 quart coolers to accomodate the number of cigars you have. Those alledged 2000 to 3000 cigar humis NEVER hold what they claim to.

Store your loose sticks in cedar cigar boxes inside the coolers.