Townhouse speaker dilemma

I am looking to upgrade my speakers, but am struggling to figure out what I should do.

THE ROOM:
I live in a townhouse condo with a shared double stud wall, so I have to be careful about low frequencies disturbing the neighbours. The room is about 15' wide x 18' deep, but behind the room, and raised by about 6 feet, is another room (the kitchen), which is about 25' x 20'. The ceiling is complex, with a dormer at the front and back of the room, rising to about 22' at the highest point (in the kitchen). The speakers must go on either side of a fireplace, in front of large windows that I am forbidden to put window coverings on (but I have room to keep the speakers back several feet from the windows). The prime listening area is about 7' back from the speaker location.

The room is actually pretty good acoustically. From the listening position, probably because of the complex angles and depth of the room (~40'), I don't hear a lot of reflections or interference.

WHAT I'VE GOT NOW:
I have a Simaudio Moon i-7 integrated amp. My source is a music server (a Mac Pro with a Lynx AES16e soundcard) running through a Simaudio Moon 300D DAC. My current speakers are old B&W CDM 7NTs that I bought in college many years ago.

WHAT I LISTEN TO:
Classical (primarily Baroque and earlier music, along with some early Classical --Haydn, Mozart, etc.), lots of chamber and piano music (I am a pianist), vocal/choral music and, jazz. Some pop music (think Sarah McLachlan and so on).

LIMITATIONS
Can't disturb neighbours, and WAF is an issue. Budget = up to about $7000.

WHAT I'VE BEEN CONSIDERING:
Totems --maybe Mani-2s, The One, Forest or Wind
Reference 3A --maybe Veena, Episode or Grand Veena
Gershman --Sonogram or Avantgarde
Living Voice Auditorium Avatars (maybe better for tubes?)

Any advice?