Here's the solution to satisfy everyone.

Split out the classes to each have their own state tourneys, and bring back Grand State.