Instead of noting the spectrum of physical presentation, we’ve been forcing babies into a binary designation to satisfy the expectations for future sexual reproduction
Most humans make peace with who they are and would not want to be altered. That's why some deaf people resist cochlear implants. Nevertheless, if a hearing couple's child is born with immediately and safely correctable congenital deafness, shouldn't the parent opt for the surgery? Is that "forcing" society's expectations on the child? Or is it taking the statistically most likely path to a life without an extra burden?
"Fixing" a sexual anomaly has nothing to do with society's expectations. It is an act of love for a child whose life is most likely to be made easier by the surgery. As between surgical gender assignment and creating a society that is not other-phobic, the reasonable parent goes with Door #1.