I would think anyone with 2,500 CDs is likely not part of the generation talking about the death of the CD player.
For all intents and purposes, I would think the CD is already dead for the average music listener. We here, we aren't average. For God's sake, we still have people talking about their vinyl collection and the NEW albums they are purchasing on vinyl. We just aren't normal.
We will always be those people who are off buying esoteric gear for way to much money just because it offers us that little bit more of extra quality.
But, the home music server is the iPhone or Android phone in someone's pocket. You plug it into the USB port on the new receiver, or the 1/8" jack connection. You start your playlist which was setup on the PC. Your entire collection may be there, and you don't have a 15" screen, but a much smaller screen that you touch directly.
Some of our kids may love CDs, but about the best we should be hoping for is that they aren't getting MP3 downloads, but high resolution audio and that they are getting better pieces of gear to listen on.
The CD death march is on. It may never be as 'dead' as vinyl, but when we likely will see 250+ GB digital music players you can walk around with. A FLAC CD at 300MB per disc, we could pretty quickly see almost 1,000 full length CDs in your pocket... or on your home system... or wherever else you want it. I would expect that we will see, at some point, high end Android type audio players come to market as this shift continues.