you may have noticed I have been on almost the same journey over the past couple of weeks. After years of listening via a CDS2/52/135/SL2 system I suddenly woke up to the possibility of streaming.
I trekked off to my local Naim store to check out the ND5 XS and the NDX. I could not live with the ND5 XS and whilst the NDX sounded good it was not quite there.
I then bought a fully up to date ex-main dealer-dem nDAC from eBay at a very good price. I had not auditioned it, however thought that at the price I was buying it at, I could easily re-ebay it for much what I paid if I did not like it.
Initially trying it with USB sticks I since taken the plunge to get a Mac Mini (eBay was my friend again - a shrink wrapped, BNIB 8gb current model at a fantastic price), Audirvana Plus and a connection to the nDAC.
BTW it does work brilliantly with the XPS however I am not sure the Olive XPS will work (I have an XPS2) it is worth checking.
The sound is superb and I do not miss the CDS2 at all. It is such a lovely, sweet seductive player and yet this set up, as yet not optimised is simply more musical. It is also WAAAAAY more convenient. No more plucking about!
I may also try the Hugo which is getting rave reviews, on the same basis, but at present there is so much potential in this system it is great.