Shrinking my system

I'd buy a pair of Totem Rainmakers or Model 1 Signatures if I was flush.

Read the famous review of Rainmakers in Sterophile.
IMO the reviewer was understateing just how good they are !

A tube amp will work against you somewhat in terms of being able to use top notch smaller monitors, I would lean towards Totem or Dynaudio, but still an option.

For higher efficiency more tube amp friendly speakers, Focal and Triangle are also quite good. Would not count out the Klipsch either.

Smaller OHM Walshes, like Micro Walsh or larger, would be an appealling option for me, especially if not being confined to a small sweet spot is of value. OHM is located in Brooklyn N.Y., which should be convenient.

Before you do anything, you need to have a really good look at your new apartment. The buildings can range from new masonary designs to pre-war buildings that were made before TV and radio. You can easily find yourself in a situation where you get up to answer the phone only to find out that its not you phone that's ringing, but your neighbors. lol. Bilding construction will definately be one of the biggest factors in speaker selection.

The Rogue/Triangle coupling is a good, small system.

I would consider Nola Boxers or Merlin TSMs.
You won't be playing very loud music. If you want to play it loudly you may want to try some really good headphones if you can tolerate them. The headphone amp and transducer technology is getting really good these days.