Lets keep everything as it stands, but add a twist. Each class has a regional, the top four move to the "State", except now called "Sub-State", then the top four from those move to "The State Tournament" all classes combined. No need to have a Grand State and will solve all issues with which class is stronger and all arguments in between. If need be this will allow for 4A splitting and if need be you could split 321A. Then numbers will be somewhat even and in the end a true individual champ and team champ will be named.