We've missed the exit for the third-best timeline that still involves That Guy: the one where Donnie bites the dust before the elections. Unless someone fills the guy's plane with Anthrax or something like that, we're still on track for locking in the USA as a failed state.
(the second best timeline with That Guy would be the one where he simply loses the election. The very best would be where the DOJ makes something stick against him & he's disqualified before the elections.)