I had a similar logic process, but didn't need any analogue inputs. Ended up with a Meridian 861v4. It's an AV processor, but therefore by default, can also happily act as a stereo dac and pre-amp. Get the right internal cards (there's a number of variations that can be chosen) and you also get balanced.
I've dem'd my unit against several dacs including a Nad M51, Linn Akurate DS and it was better than those in stereo mode. Then you can add in that with an add on box, it can happily deal with the HDMI inputs for BD audio, SACD (via PCM conversion) and also be a rather good av processor.
By default it includes room correction, for frequencies under 250hz.
Last year, I added in an ID40 card, which allows direct streaming from my PC running Roon. In short, it's the best sounding digital source I've heard, and is mega flexible. Sure, it isn't cheap, but neither is what you presently have. They can be had s/h for around £3k, depending upon what's in it.
The only caveats I'd say is that:
- It won't sound like a Naim front end. If you want that style of presentation, this is the wrong route. It's lovely and smooth, not artificially boppy
- It digitises the analogue inputs. Sure, it does it at 24bit, so it's very benign. However it's there and if you do want a non-digitised pre-amp for your vinyl, it's probably not the optimum route.