My storage is similar but I use zip-top folders (punched on the non-zip side)which are then stored in either A5 or A4 folders. I can get several sets in each folder, depending on the stamp size! I only have a few wood mounted stamps so those are in a small RUB.
I use the original packaging too