I like what they do in NAIA wrestling. More than 1 guy from the same team may qualify in the same weight. Track can have 2 sprinters in the 100 yard dash, high jump, long jump or shot put.
Swim teams can can more than 1 team member in the same event.

Any thoughts on that?