Regarding the two party system: I have accepted the fact that we will always have only two parties until we get a better voting system (not just winner take all). We would need a more sophisticated voting process, or a parliamentary system in which our new parliament selects the prime minister.
Having said that, I think we are undergoing a reformation of the system in practically (if not systemically). Periodically, a party loses focus, or issue leave them behind. This just happened to the GOP with Trump. As much talk as we have about the Democrats being in disarray, I think one can argue that the GOP has the same issues. The Dems seem to be doubling down on what got them here, when they really need to reassess what they stand for.