About this time last year, the Air Force Board announced that the EF OpEval Unit would be 17Sqn and the OCU would be 29Sqn.
Be more useful if they worried about having a fighter without a gun rather than head scratching over what Sqn numbers to allocate.