Two simple rules to fix this:
1) Do not turn out in the shoulder at all for promenade, only in the hips. Your frame should not change between promeande and closed - the change is confined to your feet and to some extent hips. You topline and upper chest must stay oriented to your partner, not away from her.
2) Lady must stay behind the man in promeande. If she comes forward until she is in a comparable position, she will force his right shoulder forward/up and cause similar problems in herself.