Rand will fake his death before TG (probably at the beginning of AmoL, after the great reunion) to deceive the Shadow and operate more freely against it. Several other Prophecies indicate this as well, e.g. Logain stepping over a paper puppet of Rand. Therefore I think the expression "he who is dead yet lives" doesn't necessarily have to point to a time after TG.