Controversial in a community other than my own means that two spirit isn’t my point to argue for or against. I led with it because it was the thing that was there after the Q, which seemed to be where you were drawing the line in the sand. I’ll concede that point.
The only thing I’d say about adopting “queer” as an umbrella term for all of us is that, as a term of abuse, a lot of us have strong negative associations with it and would hesitate to self-apply it. I use it, I like stealing power back from the bullies in that way, but I’m not gonna force someone to self-apply a slur that dredges up memories of being physically beaten, or their friends killed. An umbrella term could work, but maybe not that one as long as that trauma is still present in the community.