My niece is non-binary and we run into this issue. Now, I just ask people who identify as non-binary. “When there isn’t a good non-binary term to use, do you prefer me to use male or female words?”

So far, the non-binary people I’ve asked seem to appreciate the question.