Given the irregularity of your room, you may want something that is as not dependent on room reflections. I'm almost in the same boat as you, and am waiting for the 5.1 soundbars from Vizio and Phillips that will be coming out any time now. (Vizio in a month or two, and Phillips...supposedly...by Summer)
Both companies' 5.1 models have discrete surrounds. The Vizio's satellites might be tethered to the wireless subwoofer, whereas the Phillips has both a wireless sub, and wireless surrounds which recharge when attached to the soundbar. In this latter mode, the Phillips projects a simulated surroundfield, which is dependent on room acoustics.
Nevertheless, with the Phillips you detach the speakers for serious movie watching, and they apparently will operate for up to 10 hours on a charge, giving you true 5.1.
Just a thought.