Will spend $ 2500 for used speakers for upgrade.

Proac Response 2.5's. Trust me, you'll love them! They have a magical midrange reponse combined with outstanding bass and treble. You really can't go wrong with Proac.

If you have extra $900 dollars buy the diapason adamantes new, I am familiar with B&W,they are good speakers,But
this Diapason are just so musical,I heard the VR2, and the
Onyx,they are good, but no match to the musicality of
the Diapason,I bought mine used from Hongkong $1900,
I got lucky, Andy is awsome to deal with.I dont know, If
you can find used Diapason Adamantes, very rare.I almost
bought this speaker for 5k, when they first came out.
The reason they did not sell,too many competition for 5k.
For $3400 they are bargain.I dont miss my 15k speaker on
this speakers, very friendly.

I'd check the Legacy Focus for around that price. Not the new 20/20's but the previous model. I purchased mine for $2400 on the used market.