Exactly! I would add that you can still use "no binario" or "no binaria" in a (somewhat) respectful manner. For instance, you can say "persona no binaria" (non binary person), "comunidad no binaria" (non binary community), because both nouns are feminine, you can use the feminine alteration of "no binario". For masculine I would go with "su género es no binario" (its gender in non binary), since gender is masculine and "su" doesn't imply any gender at all.

Again, not an expert just another fellow native Spanish speaker with a bit of a geekiness about languages.