I would strongly suggest a 2 tiered CC.
First, the CC can return to it's roots of pure folding power, and this will be the CC winner.
Second, a similar thing to what happened last year as a secondary goal with a new secondary prize.
- This can be more of an "improvement" or year over year contest.
So onto what happened last year... use the avg again, but introduce a small multiplier based on the ranking/performance last year. That should mitigate things like the NCIX effect that other teams no doubt complained about