Rivals for B&W 805 Signature in small rooms?

There is a new N802D, for U.S. prices, look at this thread.

Brian
Youre right there is a 802D
Chris

A new N804 (N804S) too.

Brian
htguide.com go to club BW speakers.All the info you need.
Chris

So, from the kind posts, I realize there will soon be released a new 805S that will have a performance close to the current 805 Signature (or even better) at almost half the price. This is an important note. The diamond tweeter does not capture my atention, as I find the current 800 Sig. and 805 Sig. tweeter good enough. The crossover and bass are the areas where I would be curious for improvement.

Concerning other 800 series models, I will say they are off topic because I've tried a 802 in a small room and it was a disaster - they seem to need space to work well.

Now, the alternatives listed are:
- Merlin TSM or VSM
- JM Lab Mini and Micro Utopia
- Diapason adamante II or III

I've heard the JM Lab Micro Utopia and also wasn't convinced by the bass performance.
Any other suggestions? How about AAD 2002?