Nice inviting room and cool Marantz 8b.
"I'm looking for something better as a base, and with more of an upgrade path."
With that in mind, I'd also include a tube phonostage. Schiit Mani is great for what it is, but you're ready to invest in gear to hear what the fuss is all about.
Prepare for an onslaught of sensible and unrelated responses.
A used VPI can go far, with some research.