Sounds like you have the physical media under control.
My experience is that getting the physical media under control is less than half the job.
I have learned some lessons the hard way.
1. If you don't remember that you have something, that is functionally equivalent to not having it. 2. If you remember that you have something, but cannot find it, that is also functionally equivalent to not having it. 3. You never know what you will end up trying to find. 4. As your collection(s) reach certain critical masses, ways of storing and retrieving information about them that once worked quite well stop being time effective.
Thus, I now think that the most important items in my CD collections are not the CDs themselves but my databases. (This is, of course, an exaggeration, but not much of one).
For example, a collection that I am currently working on has 70+ CDs with well over 2500 tracks. Without the database I created specifically for that collection there would be no hope of dealing with it.
No matter how well organized the physical objects are, looking through 70+ pieces of paper (some with 50+ items), or searching the computer file equivalents of 70+ pieces of paper is simply not time effective. Thus the database.
Some years of experience allowed me to design it so I have maximum flexibility. I can query on artists, instruments, titles and variations, keys, recording dates, locations, etc., or any combination thereof.
It took a while to develop tne discipline required to keep the databases current, but it is well worth the effort.