I finally got around to rearranging the room this weekend as suggested. I'm still playing with placement of the mains and listener position. Since there isn't a door by the front left speaker yet, the two mains still measure differently (oddly the front left seems to measure better than the front right). The front right speaker seems to have significant problems - perhaps this will improve when the door is added (?).
Here are 2 different measurements of the front right speaker.

Position 1 is about 2.5 feet from the back wall and almost 3.5 feet from the side wall. Position 2 is less than 2.0 feet from the back wall and just under 3.0 feet from the side wall. Neither seem too good but it seems to improve closer to the walls unless I'm interpreting that incorrectly. I will play with it more this evening. 3.0 feet from the side wall doesn't seem that close but it's creates a pretty wide stereo image given that the listening position is around 9 feet from the front wall.
I have a few questions about how to place bass traps in the new arrangement. There isn't a corner by the front left speaker and even when I add the door, I still can't straddle the corner with a bass trap panel. Will having a panel in the corner by the front right speaker and not by the front left speaker cause symmetry issues? Is there something I can do to address this (if there is an issue)? Perhaps using tube traps for the front corners would work (with the one by the door positioned away from the corner to allow the door to open). I suppose that wouldn't be symmetrical either. The concept of closing the door and then straddling a panel across the corner has occurred to me but that is far from ideal.
Also, do I need to worry about treating anything in the small adjacent room through the opening - like the very back corners? I currently have 4 bass trap panels (2 large 7" thick and 2 small 4" thick) and 2 HF panels. I have the 2 high frequency panels on each side wall at the first reflection points but is there an obvious / recommended way in which to distribute the bass trap panels or do I need to measure all the different possibilities using waterfall plots to find the combinations which reduce ringing most significantly.
Oh and my wife likes the heavy curtain across the opening idea. I assume it will reduce any high frequency reflections from the surfaces in the opening but if it improves the appearance as well even better! Also, is there any reason I couldn't put my equipment in the space between the 2 rooms (behind the curtain)? Ok - way too many questions, I'll stop now ...
Thanks again for the advice guys!