DAC / Preamp recommendation for McIntosh MC202

Hello,

After many years of storage and child rearing I have the sickness again...

My current set up

Pioneer DVD player (bought to watch Disney movies)
Apple TV - used to stream music
FiiO DAC - with a tiny, annoying coax / optical toggle
Cary SLP 30 tube pre amp
McIntosh MC202 amp
home made pure silver interconnects and commodity 8 gauge speaker wire. (to be upgraded to Blue Jean cables probably)
Paradigm Studio 60 v2 (no tweeter dome in 1...child rearing...grrr.)

I listen to mostly jazz, and I like a dash of "tubiness", but would like to simplify and, hopefuly increase the quality of the sound.

The DAC showed a major improvement to my ears as my last addition - greater clarity, more dimension. Then I started listening to CDs of same records I would stream from Amazon Music. Another amazing bump! I started re-listening to my CDs.

While I consider CD players (used as transports) disposable, I would like to buy a piece that can work as a DAC / Preamp.

Some says that McIntosh amps have a softer / tubey sound. I remember my Carvers and Adcoms...sold and sold....

But if paired with a SS front, will I see much of a difference between my current set up? My ultimate goal is to bi-amp my speakers (which will be upgraded once my youngest is past the poking stage)

I am looking at Grace M920 vs Benchmark DAC2 L vs McIntosh D100.... Or should I get an Integrated with a DAC that I can then use to biamp my speakers. If no noticeable difference, I can move the integrated to the living room.

McIntoch 2500 tube pre amp has a DAC, but probably costs $7000 and too new to find used any time soon. Do I need McIntosh tubes driving McIntosh solid state?

Jolida makes a DAC / Preamp with a tube pre section. Other than touch and feel, would I hear the difference between it and the 2500?

Any thoughts, especially backed by experience, would be greatly appreciated.