I would have said, get everything out of the corner, put it against the flat wall, keep the m22's, and get a center channel.
And don't put your surrounds up high. keep them at just above Ear level when sitting down. With everything moving to positional audio like Atmos, DSU, DTS:X the QS8's are hard to work with, and it's important to keep the rear surrounds away from the ceiling where heights will eventually end up.
Matter of fact,if I were to redo my system nowadays, I'd really consider all bookshelves or on-walls all around with a good center channel and two good subs vs having big speakers like the m80's up front.
Last edited by newf; 01/19/15 02:22 AM.