How about going back to an EP based system. Put the EP between 3-5 @ 38 or higher in men 3,4,5 and delete MM. This may solve some of the problem for nationals regionals . Like years ago you will get the best of the best and anybody on the dock has the chance to bring home some hardware .
USA will not like this idea because this will reduce their cash flow. But it will make the nationals something special again.