While I completely support your choosing the labels you find fit you best, I would like to add a bit for historical clarity.
I was one of the original members of Queer Nation in 1990, and thus one of the first people to begin publicly reclaiming the word queer. (Academic usage preceded us by quite a few years, of course.)
When we took to the streets chanting “We’re here, we’re queer, get used to it,” we actually were using the word queer as an umbrella term for all members of gender and sexual minorities. And as an umbrella term it remained for years.
It’s not until relatively recently that people began using queer to describe an identity that doesn’t fit in with L G B or T.
Don’t get me wrong. I’m not all saying that usage isn’t OK or appropriate. I’m totally cool with it if it works for people.
I just wanted to observe that the umbrella usage, historically, came first. I should know. I was there. ;-)