Take this for what it's worth, something that was passed on to me via a Disneyland Firefighter. We all know the rumors about Innoventions, the Subs and Autopia going away. This guy says it's a done deal. He adds a little more detail stating that the innoventions replacement will indeed be Avengers/Stark Expo themed. What is new news is that the Subs/Autopia area will be a new Star Wars attraction. He stated it will be a coaster which I found very hard to believe with SM right across from it.
I'm all for a bigger Star Wars presence in the parks but call me skeptical for now as we know that CM's, even if they are firefighters, get stuff wrong many (ok, most) of the time.