So, don't take this the wrong way, it's just a question:
Is there any particular reason you want/need to outfit your lab so extensively this way, as opposed to say an emphasis on developing good simulation skill? Not that the two ideas are opposed or mutually exclusive, because they aren't.
My observation is that your focus is nearly entirely on "the basics" of available parts, which honestly modern simulators all cover just fine, and without breadboard and wiring problems. I mention this partly because of others who may read your thread with interest and be daunted at how much they "need" to buy. There is another way, so to speak.
In my (extremely limited) tinkering experience, most of the devices I need to have on hand at a moment's notice come down to what is needed to interface to whatever I am actually working with, such as microcontroller dev boards. In this case I find myself needing a small assortment of basic resistors and even smaller assortment of capacitors and wires to connect various widgets to a micro. This is just one example.
For most (pretty much all) of my tinkering, I use simulators to feel out the design before I order *anything*, followed by making an initial purchase of parts and passives and dev boards (including SMD breakout boards, etc) and *solder* things together. This is usually the start of a refinement cycle involving more simulation and eventually a PCB and parts order, and more soldering.
I'm not saying this is superior for everyone, but it has a lot of merits, not the least of which is economic. Just something to consider.