Upgrading B&W 685 S1 to ?

Hi, I really appreciated the email responses I got from the community last time on the best receiver to buy for my system (it was old Marantz AV, Linn Basik turntable w/ Hana SL cartidge, Jasmine pre amp, Peachtree DAC, Paradigm sub woofer and B&W 685 S1 speakers). Well, I took the plunge and found a nice used Hegal H160, which I love. The overall stereo experience has improved tremendously, but so have the flaws inherent in the B&W 685's. They are a little weak on the high end, require fair amount of power to drive detail out of them, etc. So my next question to the group is this; Given that I cannot have anything other than bookshelf speakers in my living room (wife's final decision), and my room size is 20x20 where my field of sound  (ie my chair) is about 7-9 feet away, what speakers would you recommend as an upgrade which will provide the right amount of detail and depth without turning up the volume so much that the neighbors complain. My taste for music runs the full gamut - from Jazz to classical to rock. I would like to think that for under $3K you could get a fairly decent speaker which has both detail and efficiency. Thank you!