@evan I write about sexuality in the eighteenth century, and the term that Jeremy Bentham used then (as a neutral, inclusive term) was sexual nonconformity. "Nonconformity" at the time usually referred to members of dissenting religious sects; I like the way it suggests that one can be a gender/sexual dissenter as well.
Queer doesn't work an umbrella term. It implies public, political solidarity. It is important to recognize the existence of many LGBT people who are not queer, even if I am.