They could have saved a lot of words if 'sex' and 'gender' had never been allowed to be conflated.
The GRA needs reforming (if not abolishing) to make the difference clear. You can acquire a different gender, you can modify your body but you can't actually change sex.