The driver behind all of this is the USOPC, which feels bound by some of Trump's executive orders and currently forces all governing bodies for any Olympic sport to adopt the 'sex assigned at birth' language.
I wonder what would happen if a national governing body for one sport decides to declare all events as all gender events, but segregates by testosterone level, either proven or assumed via assigned sex at birth. My guess is it would work, but the language would be strange as there would be high-T and low-T events...