How about we do 3 days all the Corps. Day 1 Prelims everybody competes same as usual. Day 2 semis everybody puts on a show again - but only the top 25 scored in competition, everyone below is exhibition. Day 3 finals everybody puts on a show again - but only the top 12 (or 15) scored in competition, everyone below is exhibition.
That way when we go to 3 shows, we can catch everybody, and always have more chances to see everyone (not just the elites) more than once.