Or maybe even a second category of gymnastics for both men and women, one focused more on rhythmic acrobatics that uses music and another one that's focused more on feats of strength and raw skill without music.

From the sounds of it, they're two different skills with different kinds of training I don't see why there couldn't be room for both kinds of gymnastics for both men and women.