Downsizing

I have the same problem as you, but i have already moved to the apartment. I currently have Revel Gems 1st series and a MK SB12 subwoofer. I am not very happy with the sound in my room its about 11ft x 11ft.

My room is not sound treated, i have to look at that, also the Gems sound better now i have plugged the ports. 

I am looking now at Genelec 8351.

The other benefit is you can de-clutter your rack because you don't need power amps any more 

Have you considered any of the B&W or Kef offerings?  Depending on the model they work out well.

If you are willing to DIY them, these are fantastic, small and under $500. The tweeter is IMO much better than the Focal. Massive motor keeps it linear, extended and flat past 20k.

http://speakermakersjourney.blogspot.com/2016/02/the-lm-1-bookshelf-version.html

You can build them sealed, ideal for a sub, or ported.

@fast_mick In your case I strongly suggest you get an EQ. :)

I mean, i would suggest bass traps, but you don't have any room for them. Get an EQ and clip off the peaks of the sub, this will at least let you bring the level up some what, plus the EQ will help you with integration.

Do that before doing a lot of speaker/sub switching.