You are probably right but I doubt Naruto would die. If anyone dies, it would be Sasuke but I doubt that will happen. I believe that whatever Itachi left Naruto would help save and protect Naruto.
By the way, I was just thinking that Itachi knew about everything that was to come? He explained to Sasuke about the EMS and told him that Madara trained him. If Madara had not shown up, Sasuke would never have gotten the EMS. Sasuke despised Itachi before hearing the truth about him which means that there is no way he would have taken his eyes. He would just have gone back to Konoha. The problem with him going back to Konoha was that no one there could train him to be as powerful as Itachi wanted him to be. Since Itachi wanted him to have his EMS and to be trained by a person who knew what he was doing, he might have wanted Madara and Sasuke to get in contact. He probably knew that Madara had found out the truth about him and that he would use it to manipulate Sasuke. That was okay since he had a back-up plan. The Itachi we know took Sasuke through hell just to make him strong so this would not be an exception.
Itachi's plan would then have been to get Madara to tranplant his eyes on Sasuke and to train him and then Sasuke and Naruto would meet to battle. During this battle he would save him. This was probably the only way he knew to make Sasuke stronger. He also knew that Sasuke is stubborn and would attack Konoha when he found out the truth. This stubbornness would push Naruto to train harder and become a super powerful ninja. Remember when he met Naruto and mentioned that he had become strong but not strong enough? He must have wanted Naruto to get stronger and he was going to use Sasuke to achieve that goal.
He knew that Madara would get Sasuke and Naruto to fight just to prove his point about the Uchihas and the Senjus and he would use the opportunity to save Sasuke and then Sasuke and Naruto having become super strong would combine to bring down Madara and the next villain. Just a thought.