I also saw the Captain Marvel set in store yesterday in Chesapeake VA if that helps.
Stranger things have happened, but I find it very hard to believe they would put the Sinister Six in a movie without it being name Spider-Man villains, especially someone like Whirlwind who isn’t even a B-List Spidey villain, he’s not a Spider-Man villain at all. I’d rather they bring back the Shocker than start pulling from other character’s rogues gallery.