The only way to resolve this, since the PC bunch have opened the door, is to have 4 separate sets for each competition:
males only
females only
male2females only
female2males only
[Of course, that opens the door to other minority groups wanting special treatment/venues, as well.]
No matter how much the PC bunch want to rewrite biology, males and females ARE physiologically different.