We never buy a home with fewer bedrooms than we have beds. So, if you have three beds, you buy a four bedroom home...
OP, what in your system is staying and what are you willing to part with to achieve excellent sound? I've mentioned the Audio Note K's are tailor made for your application, however, your Mac amplification would be a poor match. You may not believe they could be that good but I've heard a $50k plus system built around the K's and the musical presentation was exceptional. Of course, if your Mac amp is staying then we can all focus on something in that regard. I no longer own K's but it's because the system that was relegated to a built in wall unit like you will have was reconfigured for another room.
Best wishes but again, a home demo in your room placed like they will be placed will save you a great deal of heartache. Too many of us have assembled a hypothetically good system destined for an unsuitable application. You can either learn from our mistakes or repeat them...we will all be here to help either way. Good luck!