As a bisexual British person I absolutely support the idea of returning queer to it’s classic meaning. There’s also the option of just using both meanings. Context will establish which one you mean.
The Republicans are a right queer bunch, unlike my fellow queers in the LGBTQ+ community.
I prefer to use Main/Sub terminology. It also works without needing to change any acronyms.