Perhaps the answer to the CCF/ATC situation is as follows.
ATC sqns with a number which existed in an RAF/RNAS sqn should take on the mantle.
CCF(RAF) sections in being as air sections of the school OTC pre-war were affiliated to an RAF sqn. Perhaps they could go back to that particular set of roots.
O-D