I picked up a few tube caddies and populated them with the most often tubes cherry picked from stash. 5U4, 6AL5, 6AU6, 12AU7, etc. I keep those caddies near my workbench.
The rest are packed in boxes loosely organized by era 30s, 40s, 50s and base type. For example all my 6SN7, 6SL7 and 6V6s are in one box. All my compactrons in another.
It's working out well so far