It’s looks like the cut and dried option would be the Harbeth minis.
However, seeing that the Jade’s are no slouches either it might be advisable to try to hear the Harbeth’s first.
That way you could determine whether the P3s would be a sufficient upgrade or not. Also whether you’d need a sub to go with them.
If not, there’s also the likes of Spendor, ProAc, Tannoy, and not to mention, bigger Harbeth’s to explore.
Around $2000 does sound like a lot, but at this level the improvements seem come few and far between, and not usually without incurring a few losses also.
"Wharfedale’s flawless—and remarkable—Jade 3 punches way beyond its price. In fact, I’d recommend that anyone with a speaker budget of up to $5000/pair consider the Jade 3" (Rob J Reina/ Stereophile).