I’m not completely aware of the correct protocol here, but “with what gender do you primarily identify? … M (transgender f → m) …” is not something I would expect a transgender person to say—if I’d made that much of an effort to be (fe)male, I’d want to be “(fe)male”, not “(fe)male (transgender …)”.
One more reason to support splitting the question.