Honestly it seems like the easiest solution is eliminate sports groupings by their references to sex or gender, and just divide up by those sciencey things which are generally known to provide the athletic advantages.
Group 1 Above a testosterone baseline and/or if you have XY chromosomes
Group 2 Below a testosterone baseline.
If you don't feel binary grouping is fair, set up multiple groups to accommodate.