Preamp vs DAC vs Streamer

I am looking for advice on upgrading the 2.1 portion of my system. My budget is approximately $2,000, but would go 2-3x higher for the right preamp. 

My current system:

Marantz 7015 (using pre out)

LSA Warp 1 amp

KEF R11’s

Rythmic F12SE

Pro-ject 1Xpression carbon classic with Hana ML

Rega Aria 

Bluesound Node (Qobuz)

Schiit Modi Multibit 2

Marantz CD6007 

I am relatively happy with my analog side, but vinyl is my primary listening and further improvement from a quality preamp would be good.

On the digital side, streaming is OK (i use Qobuz), but not as dynamic or clear as vinyl. CD's sound dull and lifeless. The node is connected to my MM2 DAC via USB, CD player to MM2 via Core Power digital coax.

Preamp: Must have subwoofer management, HT bypass & be less than 4.3” tall and 15.5” deep. A quality DAC, don’t need phono stage, don't want ADA conversion for analog.
Subwoofer mgt is key as my amp is a little underpowered for my KEF’s and requiring it to drive the KEF’s full range would be problematic.

Parasound P6 seems to be the only one I can find (at any price) that checks the boxes. Any others, regardless of price?

DAC: Chord Qutest or Schiit YGGDRASIL
Streamer: Open, but quality streamer/DAC combo

i feel like the best next investment is the preamp, but my local shop (Audio Advice) advises against Parasound… new management… going in wrong direction.. warranty service, etc. They have discontinued carrying the brand, and have no preamp solution that meet my requirements. They recommend the Chord Qutest over the Parasound P6 as my next investment.
 

Thoughts and/or recommendations. Thank you