Fang Zei said:

Well, we've now seen an actual trailer for Episode 7 without having heard anything from Disney about the OOT.

Anyone think they'll keep this bait-and-switch going all the way up to release?

By "this bait-and-switch", you mean selling the SE as if it were the OT, correct? Personally, I think they'll keep it going for years after the release of Episode 7 at the very least, quite possibly indefinitely. A proper OOT release just over the horizon seems a pipe dream at best.