Which direction should I go?

I'm looking to upgrade my modest rig, but am undecided on which way to go. Here's my situation: I've got a lot of expenses currently, so I have decided to hold off on the speaker purchase I was contemplating (3-5k range). Alternatively, there here are two directions I could go:

Option 1: Buy reasonably priced towers (~2k or less) and hook them into our main family room system. Source there is Cambridge 640C v2, with a Rega Mira integrated.

Option 2: Buy either towers or nice bookshelf model and use them in the study. In there I have a headphone rig with a Squeezebox and a some headphone amps (one of which is a MF X-CAN V8) that I could use as a line stage. I'd need an amp of course, and I would seek out a tube model. I would even consider going low power SET in this scenario, since it is a smaller (but not small) room.

Which is more fun now? I feel like I could have a lot of flexibility with option 2.

Thanks in advance for any input.