Nooooooooooo!
It's looked far too much a simulator from what they've released, but I really liked hearing you say it might be more like Forbidden Journey (an actual moving vehicle). Because that's what it should be.
It would just be stupid beyond words to have Star Tours and a Millenium Falcon simulator.
Unless they plan to retheme Star Tours (in DL or DHS or both) to some other IP, but even so, with a billion dollars, they should be able to create two rides on the level of (or even greater than) Forbidden Journey. They have over double the budget of Hogwarts. But of course they can't. I've been poking them for this a lot lately, but the way they spend their money really is quite frustrating.