Excellent Speakers for Classical Music - $2,000 USD Budget

Hello All...I am primarily a classical music listener, leaning more towards solo piano, symphony/orchestral, and chamber music. I have a Rotel A14 integrated amp in which I plan to add mono amplifiers to at some point in the future. I let a pair of B&W 804 Nautilus Speakers slip through my fingers recently. There is a B&W 804 Matrix set for sale near me, but don’t know if the Nautilus are better than the Matrix. So, I let a good pair slip through my fingers. But, it got me to thinking...Are there any other brands that I should consider besides B&W? I had in mind to audition Magenpan and Martin Logan electrostatics. Seeing that I only want to spend around $2,000, does anyone have any ideas?

In my office, I use Adam A7x nearfield monitors with ribbon tweeters, and for headphones, I love my Sennheiser 800S’. I like a nice detailed, clear, and forward sound. Would another ribbon tweeter floor standing set do it for me? Electrostats the way to go?

Looking forward to your suggestions.