New equipment

Unfortunately, different isn't always better, and buyer's remorse is very real.

Good luck on your journey, sounds like you already know the path...

It may be interesting to note that all of the old, established, time-tested components in our systems were "new" once.

Unfortunately, it isn’t so clear cut that you listen to your system OR your music.
As pointed out, the most desirable is to listen to the music first and then everything will fall into place. However, once you’ve been bitten by the audiophile bug, your enjoyment becomes wrapped up as part of a sonic/musical experience. You listen for BOTH music AND sound. That is what makes this hobby so  precarious. The trick is to not let the sound be the prime mover.

I can and enjoy doing both.

I'd have to agree with slaw in that I can enjoy both as well. Likely every listening session of mine has a bit of the analytical as I'm still experimenting with entire streaming setup, changes constantly ongoing so my attention is purposely directed there. I think the problem with analytical listening is when one doesn't want to listen in that mode. IME, that indicates issue with system, or one may have severe case of audiphilia nervosa.