If you're as hooked as you sound, I'll give you 2 weeks before you make a coolidor. It's an inexpensive way to properly store all the cigars you'll be buying.

Another thing you might need is a digital hygrometer or two (one for your coolidor) so, like me, you can obsess about proper humidity levels.
So far I'm going with beads for humidification in both units (such as these ).

Savoy was a great humidor choice: Nicely built at a reasonable cost.

I like this site for cigar purchases. Reasonable prices, good selection (cigars and samplers) and good service.

I've been smoking occasional cigars for years, but recently I got much more into it, so I'm in a similar boat as you. Enjoy!