Over the last 50 years, I've seen several different terms used.
Which ones are appropriate may depend on where you consider yourself to be along the spectrum and how much does it shift?
Gender-fluid is often used for someone who can slide across the gender spectrum.
Gender-queer is often used for someone who likes to exhibit both genders at the same time, in a way that makes their birth gender unclear.
Femme, and Queen are often used by those assigned male at birth who present as more feminine but not as a girl.
Butch or Soft Butch is often used by those assigned female at birth who present as more masculine but not as a guy
Gender-fux - an unusual form - usually assigned male at birth, trans, and presents as female, but still has a beard or other distinctly male traits. Some of the spellings of this trigger alerts and censors.
There is no wrong term, you want to find the term that best fits who you want to present as at this time.
For many non-binary people, the presentation and the terminology evolves over time, often as their comfort level with their birth gender decreases or their true gender becomes more clear. It's perfectly OK to be anywhere on the spectrum and to shift any direction as you feel comfortable.
Through High School and College I was non-binary.
The Katie Perry song "You're so gay and you don't even like boys" really captured where I was.
I was accepted by the gay community because I was a femme boy, but when they would ask me if I was gay I would go effeminate and say "yes, of course daalink, I'm a lesbian". It was as honest as I could possibly be at the time, but most of my friends just thought I was joking and was straight. Only a few of my girlfriends realized how honest I really was.
Of course, even when I tried to "butch up", for a public appearance or a business meeting with a new person, it was often awkward. At best I was "a bit gay" and at worst I was the "faggot".
The homosexual communities are actually much more tolerant of trans non-binary people than the straight world, but much of this depends on your birth gender and sexual preference. With a group of gay men, my femme personality went over great, and I was even popular, but with a group of lesbians who knew I was attracted to women, many of the women would become jealous and possessive, especially soft-butch lesbians. The most threatened were the girlfriends of bisexuals. Often the bisexual girl was attracted to a soft-butch girl, but the partner's fear was that the bi girl might find an openly femme guy who liked girls to be too much of a temptation.
The good news is that you already have a partner who loves you and accepts you as you are, and the two of you can explore different communities to see where you are comfortable.