NDX or Serve and nDAC?

Hello all - this is my first post as a long time observer of these forums.

After 12 years, time has come to part with my old Naim active Credo system and set myself up for the future. After some auditioning I am pretty much decided on 202/200/napsc/Hicap for the amplification. My first real decision is around the source?

I have listened to the nDAC and NDX through the above amplification with Ovator 400's at the dealer using my macbook and WAV files as a source.  I was impressed with both nDAC and NDX but have not reached a conclusion.

I will be using my Mac at home as a source, predominantly with music purchased from itunes but I also have a lot of cd's that I can rip on to the computer / place on a NAS. I am considering using a wired network. 

My dealer doesn't have a Serve. It seems to me reading the threads that  I was looking for some comment as to sound quality in comparison