I'm a big fan of Naim digital gear for all the same reasons: musical and tight. I owned a 3.5 w/ flatcap, and considered a CDX at one point. I have also owned a Meridian 508.24, had extended in home audition of Wadia 850 as well. I currently own a Levinson 390S, which betters all those others to my ears. Smooth as silk, yet highly resolving with really excellent soundstage and imaging.
Would a current model Wadia or Naim (say CDS II) beat it - quite possibly, but im not going to find out because it's a crap shoot, so in general find something you like, and listen hard now, "KEEP IT!" It's tempting to sell gear you like, thinking something else is netter- only and end up paying more for something ytou like less! Having dais that, I would easily trade up to emm Meitner gear, or DCS separates, but that's a ($15K used mkt) proposition