With modern EHR systems, there's no reason to link anatomy to the sex marker.

Just have it record the person's reproductive anatomy as what it is, which also helps people with the more out there intersex anatomy, such as having a penis, one testicle and one vestigial ovary, or having a penis and ovaries.