I’ve used, “woman”, “man” & “non-binary” when sex assigned at birth is not needed. In cases where it is I use “woman (AFAB)” and “woman (AMAB)” and similarly for “man” & “non-binary”. That way AMAB & AFAB never appear on their own, they only appear if needed to qualify “woman”, “man” & “non-binary”.