My suggestion is:

Previous champions and 2nd place finishers of CWF get into a separate Knockout stage after the Preliminaries.
So there will always be a new 1st/2nd place finisher every CWF.