I'm in a very similar situation myself, and I would say just do what feels right and what you want. You could also try just not telling people your pronouns and letting them figure it out for themselves if you don't really care (of course its just a suggestion, it just works for me so it might work for you).