Hopefully, more experienced forum members will respond but perhaps I can start the ball rolling.
First of all, do you have an idea of how the room might be affecting the sound?Having a dedicated space is a real advantage. It would be a shame to waste this resource by neglecting to optimize it. Why make things harder for yourself than necessary?
Buying gear before evaluating and if necessary, treating the room, would not in my opinion, constitute a wise approach.
Secondly, there is the issue of knowing what you are aiming for, sound-wise. If you cannot define this, you cannot know what to keep and what to possibly replace. And it will be very difficult for anyone here to help.
If it seems I am merely stating the obvious, I apologize for not being more helpful
If you have, in fact, clarified the two issues I've raised, it's not evident to me based upon your initial post.