You have some good points. I personally don't watch a lot of American queer series or movies because of this lack of diversity. I use to watch queer movies from all over the world. I have watched queer movies from Iceland, France, Argentina, Peru, Japan, Korea, Hong Kong, Germany, Spain, Thailand, etc.
In fact, I no longer have an appetite for USA queer movies. As you said, 90% of the time the protagonist is a white blonde guy who is a twink and/or muscle head.
Lately, I have gravitated towards BL. Not sure if you know what it is, but basically Heartstoppers is a BL (and so is Young Royals). I watch Asian BLs, so things like 2Gether, Love Sick, KinnPorsche, Cherry Magic and Choco Milk.
However, even Asian BL has a ton of diversity issues. In general, Asian BL tends to portray more masculine gays (well, that is technically a prerequisite for a real BL), and the guys are beautiful (BL = Boys Love from a Japanese term. And Japanese like their beautiful boys lol), and usually very light skin.
However, The Philippines is challenging that IMO. But that's another story. BTW if you have Netflix, you can watch season 1 of a Filipino BL called Gameboys. One of my favorites.