It was close but next time Trump will win with a comfortable margin.
Obviously, that's premature, getting into the election four years from now. Depends upon how things go, and how Trump holds up physically. I believe he will be the oldest ever to begin a presidency.
If doesn't want to run in 2020, Mike Pence looks to be a strong contender, based on his excellent performance during this campaign.