I've started just using the term queer as an umbrella term. Some of the older people in the community don't love that term because they lived in a time when it was considered a slur, but it's pretty rare. It's just really convenient because it includes everyone under one simple term.
Also, yes, I have noticed a lot of lesbians have started referring to themselves as gay. It's all evolving, and I agree that queer is better than continually adding letters. to LGBTQIA2S+.