If Gryphon/AGD sound dazzled you, it might be time to set up the Maggie as a Asian wall divider (rest its speakering duties for a few months, let the old lass rest). Get a Borresen X2, before any price hikes.
The rest of your electronics should be just fine.
I would get rid of that goofball Martin Logan sub and get a Rythmik FM8 subwoofer (considering that you may have a Borresen and Maggie as speakers).
Much of audio group Denmark’s tricks revolve around their unique noise mitigation solutions, which can dazzle many dudes perceptually. You can do it affordably with their AXXESS line of cables and power conditioners. Otherwise, spend a little extra on the Ansuz (mainz) power conditioner.
Last, but, not the least, if a small (setup restrictions, etc) and untreated room is all you can do....lower all expectations, have several swigs of whisky, renounce everything and become a wandering monk.