Yes very much so I’m afraid. Recently serviced at Naim HQ and sounding the best of all Nait2s I’ve ever heard (on this side of the ocean that is, can’t be sure about the cryo AV Options restorations in the US). Back in its new Naim box, I gave it a kiss before tucking it away after 16 years of dedication
The XS3 is simply a full level up giving much more, without giving up much of what I liked previously. The only problem compared to the Nait2, is that it is so much more revealing that I needed to improve upon the ND5 XS2 to bring it closer to the LP12, now turbocharged by the XS3 phono stage.
All these threads to me are a reflection of the need to make choices. Like you I was “how about analogue into the Atom HE” and realised it doesn’t work that way. For me I wanted one system (for now) and that either had to be fully digital, or traditional catering for either source.
As analogue is one of the things where my teenage son and I now have a connection, I built one system with two equal sources. With LP12 Majik+ analogue on one hand and ND5 XS2 + nDAC/DC1 digital on the other it is mildly source-first. Fortunately my ripped CDs fitted a 512Gb quality usb drive.
Fully digital, Atom HE to whatever out (a NAP, active speakers) is a smashing proposition IMO. In your case with a Core to provide a NAS function. You’ll have the Naim sound and quality and service in a few boxes and done. The huge threads IMO are to come to terms with that there is no free lunch. Adding all things up, and spending a bit more, it can be quite simple in the Naim ecosystem.
You could add a second system with the bias on analogue then with the Nait2 or the UQ. But I must say the latter is now the worst of both worlds, dated digital and not the highest level analogue. That said, if you’re fond of it, keep it. Add a NODE or MXN10 for the latest streaming tech and you already have a separate phono stage and turntable. Rega Fono and PSU look nice together. Just beware that from what I’ve heard adding a NAP100 to the UQ2 will not bring much. DAC-V1 plus NAP100 is something else, but then it will be fully digital again, albeit much fun at not much outlay. Headache stuff!
I hope the Acoustica show gives you fresh inspiration, as will rereading and rethinking all this.