The only fix is to separate the government from education, so that these football games would not have any sort of government-related implications.
My fix was a Constitutional amendment. Your fix is better, and much more doable.