I think every one has there preferences, and I have a similiar problem with being forced to put my speakers way to far apart and compensate with too much "toe-in". So if you are enjoying it go for it
However, I'm old school and most head phones and surround sound for music are not my thing personally. I want to listen to music like I hear it live from a stage, or a small club ... I like hearing that the drummer is behind the vocalist and I think that some of the "spacialization" is lost unless it was mastered for multi-channel . Saying that, they are opening a really interesting music hall for the Paris Philharmonic , which is all based on acoustics, with performers being more or less in the center of the hall -- this should be interesting to hear (mostly classical, but electro and jazz too). In any case, the music will not sound like stereo they are saying.
. With new array
I do believe with your budget, you would have a mind blowing 2 channel system (or 2.1 ) with some sound treatment for your room corrections thrown in. But I think its very personal. As long as you enjoy it, that's what counts. The only thing that gets my dander up is when people listen to their system more than the music.