Trying to Decide on my next Purchase

@oldschool1948 

The Naim Uniti Star is a step down from the Uniti Nova. The Nova is by far better than the Star. The Nova is the top of line within the Uniti series. The Uniti series is Naim's entry level series. But the Star is very good for its price point. While the Nova isn't exactly cheap at $7500 but if you must go Naim analog integrated amp + Naim digital front end components you will end up spending a lot more than the Uniti Nova. The Naim separates (digital front end + analog linestage preamp + power amp) will cost you even way more but they are awesome. Naim makes very musical sounding gears but can be pricey. Depending on your budget later down the road or when it's time for you to upgrade, I highly recommend Naim separates. They might pair quite well with your Tannoy. 

caphill - thanks for the information.  I haven't set a budget.  This is my retirement system, so I'm going to get what I want - but at the same time, spend as little as possible. 

I've considered an integrated tube amp, but then I'd need a good DAC and phone preamp.  I've considered a McIntosh integrated amp that comes with everything, but I've always like separate components.  

I've considered keeping the M12 and buying a better DAC, phone preamp, and either SS or tube power amp.  I'm doing research, talking to folks with more knowledge and better gear that I have, and auditioning dealer gear.  I hope to have everything I need before Christmas :-).

That's sloppy support from NAD, downloaded updates  should always contain a text file with instructions. Shouldn't have to run around looking for it. 

@oldschool1948 

So this isn't your main primary system then? McIntosh makes pretty good amplifiers and are generally more affordable than Naim products with the exception of the Naim Uniti series. 
Naim separates will run you up to $90k to $100k which excludes the Naim Statement gears.

The Naim Statement gears, which consist of a Naim NAC S1 linestage analog preamp ($90k) and a pair of Naim NAP S1 monoblock amps ($180k), will cost you $270k total, and this does not include digital front end source components and analog front end gears. $270k is just for an analog linestage preamp (no phonostage) and a pair of monoblock amps. The Naim Statement is Naim's flagship series and these are cost-no-object design gears. They are phenomenal probably one of the best sounding gears I've ever heard.

I happen to own these Naim Statement gears in my main reference two-channel setup but I'm not using Naim digital front end source components. For digital front end components I'm using the DCS Vivaldi full four stacks which consist of a Vivaldi master clock, Vivaldi upsampler, Vivaldi DAC, Vivaldi CD/SACD transport. 
I also have a Kronos Pro turntable with an Audio Research Reference 10 phonostage preamp, 12' Black Beauty tonearm, Air Tight PC-1 Supreme mc cartridge & a discrete class A linear power supply unit for the Kronos Pro turntable. For speakers I have the Magico M6 big floorstanders. The Naim Statement gears pair really well with the Magico M6. They sound spectacular together. 

However, the step down from the Statement series is the 500 series separates and the series consists of the 500 series stereo power amp with a separate PSU (power supply unit), the analog linestage preamp with a separate PSU, and the digital streamer/DAC with a separate PSU. One thing about Naim separates, you can add and upgrade  Naim separate PSU for each Naim component whether it's a CD player, digital streamer/DAC, analog linestage preamp, power amp or phonostage preamp. This also applies to other series except the Uniti series. Cause the Naim Uniti series is an all-in-one box solution that has digital streamer/DAC & integrated amp all in a single chassis.

The Naim Statement is Naim's flagship series and these are cost-no-object design gears. They are phenomenal probably one of the best sounding gears I've ever heard.

+1 @caphill