I agree with Dr. Palmater virtually entirely, and would add this:
If the amendment amounting to making everyone a 6(1)(a) is challenged, my own view is that it's highly arguable that such an amendment is valid because the title of the act, and therefore the purpose of the act, is the elimination of sex-based inequities in registration. That is a broad purpose. I would encourage you to be bold given that broad purpose.
Thank you.