When I was thinking about it, I came to the conclusion that sports that don't require confrontation should just evolve and give up on the competitiveness. Swimming, javelin, whatever shouldn't have the winner be the best out of every contestant, we should celebrate each and everyone's force of will to better themselves first. We already have that with high jumping, where individual performance is rated Vs their height goal.

Give up competitiveness in sports where it isn't needed, and you no longer have people melting down because someone has more muscular mass, or a different gender than expected.

Give up competitiveness in sports and you return to a celebration of the human body and it's physical prowess, instead of childishly fighting for who's best.

Obviously this doesn't work in football, or sports with direct confrontation, that i haven't found a solution yet, maybe during the next shower ?