Personally, I would not expect very good sound from CD-level formats (or below). I had my "digital" period but I much prefer vinyl. So perhaps you should reconsider the strategy. If Naim can do DSD or hi-res PCM you are closer to a good solution, I would think.
