Have you thought about all other nouns used to address a non-binary person? Just a title might not suffice in all situations. (not that I know much about it. I just remembered there was a topic with an avid discussion about it not too long ago)
Link, just in case you need it:
