Is your existing amp the original Supernait or a Supernait 2?
What improvements are you looking for over your existing set up? What speakers do you use?
If you like the Naim sound and the general naimyness of all things Salisbury, then stick with Naim. They are well supported and hold value well, come the time to change or whatever. The Naim app is very good and easy to use; I prefer it to the Auralic version. Don't underestimate the app when assessing streamers/players.
If you're not a box swapper, I'd be seriously tempted to take a look at a Naim Uniti Nova. There are usually some good deals around on ex dem units, which would normally have full warranty (which, to correct misinformation that is commonly spouted on this forum, is a basic 2 years plus an extension of 3 years parts and labour (exc CD drives), when registered, to the original owner. Only the basic 2 year warranty is transferable. Many don't believe this, so I will paste below from the Naim web site:
"1. What is included in this Warranty?
If a Naim Audio product is defective in normal domestic use, due to a fault in materials or workmanship, Naim Audio will at its discretion (and subject to the terms contained herein) either regulate, adjust, repair or replace it free of charge within a reasonable time after return of such product during the Warranty period to Naim Audio’s address (detailed below). This Warranty is offered from the date of purchase by the original end user and covers the cost of parts and associated labour required to correct such defects in materials or workmanship arising and advised to your retailer or Naim Audio during a period of Two (2) Years from the original date of purchase.
Please keep a copy of the sales receipt to establish the purchase date of the product.
4. In addition - [Optional] Limited 3-year Extended Warranty
Provided that, within 6 months of the date of purchase, EITHER we receive your fully completed Registration Card OR you complete the Product Registration Form on our website, we will enrol you (the original purchaser) for our extended 3-year warranty. This Extended Warranty covers parts and labour (excluding CD/DVD laser transports, components and hard drives) and, except as otherwise stated below in this paragraph 4, is subject to the terms and conditions set out herein.
This Extended Warranty is offered exclusively to the original purchaser of a Naim Audio product (excluding mu-so products) and only when, within 6 months of the original purchase of the product, a valid completed registration card has been returned to Naim Audio or you complete the Product Registration Form on our website.
In the event of a change of ownership during the product’s life, only the basic two-year manufacturer’s warranty will be transferred to the new owner. Please note that proof of original purchase must be provided. Extended warranty is non-transferable." ).
Many will advocate having a separate DAC and streamer, but I've found integrated units to have the edge, SQ wise.
Don't forget to distinguish between a network player and a streamer. Most units do both of these functions, but they may be, for example, a better network player, than streamer.
Ripping loads of CDs should now be questioned, as lossless streaming services are now good with extensive catalogues. It's always difficult to directly compare a Tidal stream vs a local fie or CD, as you can never be quite sure which master you're listening to.
I've always found that a CD via a decent transport in to a DAC/streamer will yield slightly higher SQ than a stream. Others have different views.
If you want to consider above the units you have already highlighted, then explore a Moon 380D MiND or V MiND. Warranty on new Moon products is 10 years.