CD"S

"I know this question is a little hard to answer."

No, it's very easy.  There's nothing about a silver disk that adds to the SQ of the files on it,  In fact, playing the disk detracts from SQ.  Rip the CDs and the SACDs.  There are programs that do all the meta-data for you.  Once set up it's very easy and it can be set up to control completely from your phone or pad.  You can also borrow from libraries and friends to help create a collection.

@ sd40
"One thing to note, however, is that the condition of used CD's for sale can only go downhill over time. Eventually the supply of good-quality used CD's will play out."

I have copied used CDs from various sources, some looking unbelievably damaged.  Yet the vast majority copy beautifully for later replay. I am amazed at how resilient the CD format really is.  Yet if put into a CD player, error correction during listeneing might adversely affect the SQ.  That's one of the advantages of ripping.  

We're going a bit far afield. 

The OP asked for advice between going to a new CD disk player, perhaps the Yamaha, or to hard disk.

As you might suppose I am in agreement generally with audiotroy.  Except that you don't have to spend big bucks to rip the disks.  I rip disks (with metadata) easily and maintain my library using JRiver.  Also, I have discovered that a laptop can give fine and quiet service provided it is a very simple (and inexpensive) one.  I use a 14" ASUS with small eMMC storage and with the screen turned off for playback.  I believe this works better than a powerful laptop to minimize computer-generated noise.  Great laptop for travel too as its simplicity results in very long battery life.  Add a 1TB portable HD and you're in business.