Possibly we keep equipment the same but change the race format? What I hate seeing is the leader & same lap challengers having to hold back working thru traffic not once but up to as many as 10 times in 8 minutes.
We could limit the size of mains based upon a percent delta in total laps. Some math and stats wizard could offer up a formula...