I'm sort of in the same place as
@BMXTRIX for you. The gear you've bought is fine (especially at those price points) and as you are in an Apartment, I can't see turning the volume up in your living room space loud enough that it wouldn't bother the neighbors causing all some grief no matter how many more speakers are added. I'd keep the gear and run it a 2.1 with the Speedwoofer in that area. Save building the full HT setup for the next place. Even though I have numerous HT systems, I listen to wireless headphones a lot just for background tunes while I work (both inside the house, in the garage, and outside too).
However, I understand some folks can't tolerate headphones on, or in, their ears for long periods. (I too need a break after a few hours.) So for your work desk, have you considered some wireless speakers you could use near field while you work? You could go to Bluetooth as your NR6050 will broadcast to them, or use some with their own transmitter connected to the Zone 2 outputs on the NR6050. I have a cheap pair with a small sub in our dining room just for background music via Spotify when entertaining (or wrapping Christmas presents!). Everybody loves them.
Just a thought...
I hope this is helpful.