My wife and I have an already booked same day 14 -> 28 trip coming up in August. I wonder if it's safe to assume that the schedule will really revert by then, or should I try to proactively arrange a 1 night stay in Portland now? We'd have to move our Starlight trip one day earlier, but that'd...