Here are other threads on the subject:
satow- How to store rechargeable li-ion batteries
Bullpup12564 - Largest 18650 battery holder
I recently got my hands on one of the MTM Case-Gard cases mentioned in both threads. I don’t remember whether it was on purpose or not, but I’ve got the S-25-12M which is a bit taller than the S25D. In retrospect I suspect that I got confused on Amazon? I’m happy with what I’ve got but I suspect that the S25D is the best fit!