You seem to be resting your assessment of the Nicola foretelling on your theory that Rand will fake his own death. I think there is a great deal more evidence pointing to Rand dying a literal death during TG and being reborn in some manner afterward. Your evidence for Rand faking his own death, such as the prophecy of Logain stepping over a paper puppet of Rand, could be interpreted as Logain stepping over a fake Rand (such as Taim posing as Rand), or even just Logain succeeding Rand following TG (in which case this prophecy could be interpreted as you did, where Rand is not really dead, but taking place after TG and not before).

Also, there are some flaws in the logic of what you are suggesting. Assuming the events of the Nicola foretelling happen chronologically, it appears that Rand faking his own death (by your interpretation) occurs prior to "the great battle," which you have suggested to be the Seanchan attack on the WT - but you also state that you think Rand will fake his death sometime in the beginning of AMoL. Now, considering we have very strong indications that the Seanchan attack on the WT will happen in TGS, there seem to be some issues with time line in your interpretation. Also, we can assume that Rand's truce with the Seanchan will come at some point before AMoL, most likely in TGS, but the foretelling states that "the land [is still] divided by the return," which would be before the time when you believe Rand will fake his death, again raising issues with the chronological sequence of the foretelling.

And, apart from all that, why would a battle that will be small meat compared to TG be referred to as "the great battle?" Sure, this will be an important battle, but it is doubtful it will be any larger than Dumai's Wells, and while it may be relevant to the future of the Aes Sedai, Dumai's Wells was clearly more important to the future of the world.