Finding a Bookshelf for Luxman C900U/M900U

Hi everyone, I’m finding a bookshelf to replace the B&W 802D. My genre: Mainly Jazz & Acoustic Pop, 20% of Classical/Opera, and some Bossa Nova, 

Here is my story, I used to have a B&W 802D powered by the Luxman C/M-900U and Holo May KTE. However, the 802D is quite big for my room (WDH: 4m x 5m x 2.7m), the 802D create a tremendous bass in my room, which sometime make me feel tired when listenning in the long session. So I decide to move down to the bookshelf which will help me to avoid the room mode. 
 

The budget is around $5k -> $7k (secondhand speaker is a great choice).

My wish is TAD CE1 but out of budget. I have some name in my mind:

- Focal Utopia Diablo (Ver 2 not Evo)

- Dynaudio Confidence C1 Signature

- B&W 805 D3