Please mark me down as firmly, firmly under the belief that Star Tours 2.0 is not going anywhere in either Disneyland or DHS (although DHS will likely get a plussed exterior). If someone has actually heard insider information to counter this I am willing to be swayed, but until that time I think people are treating this like a Small World moving to Epcot type speculation. Disney is not axing a popular and recently re-done attraction for the sake of slightly strange theming continuity. That's not how Disney generally operates.
Star Tours takes place in a Space Port, this new land is a very specific planet, there is no requirement for them to be located right next to each other.
I will eat my hat if Disneyland's Star Tours is re-themed to Ironman, hold me to it.