I think there should be an under 220 pound (100 kilos) and over 220 class, and the winners of each should face off for the overall, like it was in the 1970s.
either that, or we should go to three height classes, under 5'8, under 6', over 6'
or maybe go by BMI
just some thoughts