Veesha question

I need this for what I'm writing. And should they actually be Masha for Vee? I mean, is there a nice replacement for Girlfriend/Boyfriend, referring to non-binary people? Partner doesn't fit here, and Mate is too ambiguous.