I use the smaller AA/AAA/CR123-18650 plastic cases and then I put them into something like a medium size Plano storage doohickey like you find at Bass Pro Shops, in the fishing section, or at Lowes/Home Depot, in the 'organizer' section.
I guess the smaller cases and a plastic ammo can, might work?
Just store them in a cool, dry location and discharge them down to 3.6-3.7v.
For small batches, I do that and then ziplock bag them and stick them in the fridge.
Chris