Many thanks for the replies so far, very helpful
I have not made a firm decision about whether to keep the Naim amp or not, it depends what the alternatives are.
I want to retain the ability to play CDs, either with the Naim or having a music streamer with a built in CD player, if such a thing...