I was in your boat a year or two ago. I'm with the others, go ND5XS, maybe a used one to reduce depreciation if you are unsure about the commitment and want out. I ended up going the route Chag is suggesting to you. I added an ND5XS to my XS and it seemed a natural partner. To upgrade that, out of curiosity, I added the nDAC later. The XS is plenty good enough to show the difference in sources. When I moved to the SN2, this source is still acquitting itself well and for further hijinx, it leaves the option to swap the ND5 for an NDX, add power supplies, change DAC, whatever. I like the flexibility Naim offers.
As for the DAC in the ND5 being better than the CD5X, don't know about that one. Could be a tossup considering your CD5X has a flatcap. That's got an engaging way about it all its own. See if you like the ND5XS presentation and if you do, you can either swap your CD5X for a CD5XS with the digital out, convert yours, pick up something cheaper with a digital out to serve as a transport, simply leave the CD5X attached as it is if you like it, or sell it and go streaming altogether. A lot of options open up with the streamer.
I think there's a nice visual tidiness to an all Naim stack. It appeals to my IT rack-mount thinking, where our chassis rack components are expressed in units of 1.75 inches. We think in "U"s - 1U, 2U, 4U, etc. The XS series are 1U boxes, the Classic is 2U, etc. Wonder if I could slip some Naim gear into our datacenter to liven things up a bit? Tell everybody they are encryption appliances?
Sorry for TMI Skip. Go for the ND5XS, I think you'll love it and it'll leave you in a flexible position.