You could get a few TBs worth of hard drive space and rip them all to the computer and use some sort of front end to categorize and select everything... A guy I work with does this with his movies (and everything he rents) and it works great. He uses Apple TV for his interface but I'm not sure exactly how it all works. I'm not sure what to do regarding the physical copies - 2,000 is quite a lot. I packed away about 1,500 CDs about a year ago - I put the discs in a few 300+ jackets/books and the cases in storage in the basement. The racks were taking up too much space and didn't look so nice. To be honest though, after ripping them all to the computer I rarely, if ever, take out the discs to listen to.