The Macy's close to me solved this problem by getting rid of men's or women's dressing rooms and made them just "dressing rooms" which is what stories like Old Navy, Khols, Amercian Eagle and such have always done.
They don't need to be gender specific since you are not sharing a room with anyone, just a hallway