While I have a dedicated Martin Logan home theater system and separate two-channel audio system(s), if I had to do it all over again, I'd ditch the home theater setup altogether, and just go back to a fully dedicated two channel stereo system for both.
A few years back I went into one of the upper tier Magnolia Audio stores within a BestBuy, and had the sale guys put their best 2-channel systems in play, dragging amps over from the audio room into the AV room. We played the same BluRay concert tracks back and forth several times. Tried 2-3 multi channel movies too. The higher power 2-channel stereo system with the two larger front speakers was simply amazing. They seemed quite puzzled by it all, LOL. Was funny, shoulda seen their faces :) All of the tracks were recorded in stereo tracks to begin with before they became multi-channel. Just sounded better too, overall. Maybe sometimes simple is better in some cases, fwiw. Go figure.