As uptight as I am about labels and organization, I simply have all my rivet tools sitting in a machinist's chest drawer labeled (oddly enough) "Rivet Tools". Haven't lost one yet! I do have drill bits and countersink bits in a block similar to what you show.
When you get to Granite Falls, MN to tour the WW2 museum, ask if you can see this rivet set rack. Might be interesting to see what else you can see. I promised not to tell.
Roger