I needed to make this image for my upcoming book, so I figured I’d share it with the rest of the world ^_^
Feel free to distribute it around, print it and spread it on (for non-commercial purposes only).
Click the image to download the full version.
A new bisexual umbrella
Bi radical 
Queer is should definitely not be under the “bisexual” umbrella, queer is a term that rejects “bi”(nary) gender categories entirely.
“Queer” is a word sometimes used by people to denote attraction to more than one gender, which is why it is included.
As for the good old binary accusation, you might want to read my post:
Words, binary and biphobia, or: why “bi” is binary but “FTM” is not.
I will say that you had it right in that “queer” usually constructs bisexuality as “politically backward”.