Just wanted to say, so much yes to both these things.
It's funny because people sometimes act like they've stabbed me or something after I've had to correct them about my gender. I mean, I'm already dead inside, so you can't kill me! Seriously though, it's really a lot less of a deal than some people make out. Being misgendered sucks, but that's life. It's not up to other people to take massive precautions to avoid accidentally causing me discomfort stemming from my own dysphoria.
As someone who has also dealt/deals with social anxiety, you're very right about it being something you need to work on. You only get better when you push yourself to talk to people, even if it means you walk away from a conversation needing to change your shirt because you were sweating in fear so much. Which has never happened to me. Ever. Nup.
Also, I see people suggesting a type in box... I think that'd actually harm the trans and nb people around here. It's a feature some people would use to mock trans/nb people: guarantee we'd see a sudden rise in the apache helicopter population. That really sucks, but I think that's realistically what would happen.