My opinion is this:

Get rid of National and Regional status.
Run all races as Club Races.
Top 24 make the runoffs.