(Hegel vs Luxman) vs PS Audio

Keep what you got and get a better room. The room is the most important piece of your system. You have a terrible room, it doesn’t matter how much you spend on equipment, it will sound bad. Great sounding/treated room, mediocre equipment can still sound good. 

I'm not sure your room is so bad; I'm not sure why @rbstehno made that comment. You have high ceilings, which is great. You may have it open on one side, but if you're positioned reasonably close to the speakers, I don't see why that would harm soundstage. Perhaps you can post a drawing of your space. I would like to know what you have from Acoustimac. If you don't have diffusion happening in the space, that might be helpful for soundstage.

@krymer2 I own the Hegel H30's and like them very much.  The new H30A is the same as the 30 but they are using a different supplier for the caps, and a big price increase.  I would see if the American supplier happens to have a couple H30s still available at a discount.  Having said that, one of the intersting features with the H30 is 1100+ watts in mono mode and the ability to run them in stereo mode at about 450 watts x 4.  Now you have the option of bi-amping your speakers.  I am using one amp as Left/left and other right/right.  So there's my 2 cents.  Great amp with added felxability.  

To be clear, you don't use the subs for music?

I do use the subs for music. I have tried with and without and really like the extra at the bottom and I mean bottom. They are crossed over very low.