From what I understood, the two people Rand saw were indeed Lan and Demandred.
It would make sense that it was those two, as Demandred had been demanding his attention for the entire battle and Rand was having a time scanning the battle and grieving / accepting the deaths of friends and loved ones.
When Lan came back up I initially had the gut reaction that Rand brought him back, but then that didn't seem right to the story (the can't heal death lesson from book 3). If you re-read carefully the end battle moves between Lan and Demandred, Lan takes a wound "on the side", making a reader who is caught up in the moment think that he is dead, but someone who is careful with his words could notice that room was left open for Lan to survive his sacrificial yet effective finishing move. [Think Aes Sedai talking carefully around truths].
Brief: Lan got hit in the side, and survived, Rand did not reincarnate Lan.
just my thoughts.
Great read, great ending,
Thank you RJ and BS