Maybe its time for you to think outside the box a bit. First I doubt that you will ever successfully optomize one system for both digital and analog, at least I haven't. Up until recently the digital always took second place. Until recently.
Short story - I bought a Wadia 302 ran it thru my main system - it was very good but really was not a great improvement just a little different. Then I connected it direct to a tubed PP amp. Huge difference! Slam, detail, dynamics, etc all without an apparent downside. I now have two seperate systems and one set of speakers. One system for digital and one for analog (and other sources). I now actually prefer the simplified digial system over my analog system. Maybe I need a better analog system now, but/or I can probably even do better with a better CDP or amp, but I'm happy as hell as it is. FWIW!