Too soon to know what anybody will do in 4 years. I do expect a lot of dems to run and if trump succeeds in making gop happy, then at least one gop will challenge him who isn't happy with him.
As far as trump, I'm cautiously optimistic. As what Chaim has said on his shows, if Trump does good, we will be his biggest supporters.