I'm still not sure about how he got saved from the train track in the first place. How did Naoto save Takemicchi when Naoto himself was dead? And he had to touch his hand to go back in time in the first place right?
It's like saving Naoto was fixed somehow, but the other stuff isn't. But the news still showed him as dead.
I guess the first time travel wasn't initially linked to the handshake, but it still makes no sense how Naoto knew he was going to die there. It's not like he told him. Maybe it's just some Big Brain detective work