If you contact the NCA recruitment team at Cranwell im sure they can point you in the right direction and give you all the information regarding the changes in structure to the different course. Havn't got the phone number to hand and the MOD operator aint that great, but they come under the recruiting umbrella, so even OASC can point you in the right direction to contact them.
If i was in your shoes i would contact them before the AFCO.
Good luck