I agree, Keep what you have for now and see how it works out. Then decide if it's just not going to work. I've found Tannoy speakers to be good for nearfield. You could get a pair of their pro monitors with the dual concentric driver. Or Spendor S3/5 monitors. Jrd351's recs are good too. You can add a headphone amp. A nice setup would be the Emmeline XP-7 headphone amp, Sennheiser HD600s or HD650s and an aftermarket headphone cable. The headphone world is a whole 'nother universe if you're not already familiar with it.
need advice on downsizing system for smaller room
I have moved in with roomates in a home with 3 cats and no longer have a large living room. I don't dare put my gear out with the animals and am isolated to using my bedroom for music listening. I am looking for recommendations on small speakers and amp combo that can also be used for headphone listening. My current components are; Metronome tubed cdp, first sound presence deluxe mk11 preamp, mccormack dna1 revA, chang light speed and various high end cables. My new room is approximately 11'x12'. Wouldn't mind trying tubed amplification