I feel like a fully enlightened society would be a step beyond weight classes. Imagine arranging athletes into leagues based on a combination of metrics, from muscle mass to VO2 max to age to height to bone density, with different competitions putting different weights on each facet of physical fitness (ie combat sports prize pure strength to a higher degree than track and field).