There is the Walmartized rainbow culture that you’re talking about and then there’s the meat and potatoes queer culture that is and will always be counterculture for as long as human reproduction remains sexually binary. There is still a substantial amount of “queerness” that you don’t see on TV.
Primary culture loves to pull from counterculture after the morsel has been thoroughly sanitized and monetized.