Somwhat confused as f*ck about the whole Aegon Targaryen thing... (S7E7)

Can someone clarify here or maybe the Wiki is wrong or movie plot changed from the book itself?

Rhaegar Targaryen:
-Older brother of Viserys and Daenerys.
-Married Elia Martell and had 2 children (Rhaenys and Aegon).
-Marriage was annulled (invalidated) by the High Septon, who wed him to Lyanna Stark in secret, who was betrothed to Robert Baratheon at the time, and had 1 child named Jon Snow.

Jon Snow:
-Raised by Eddard Stark (Ned) as the bastard son. The notion was that Ned had a fling with a Winterfell prostitute hence the bastard son part (which was untrue).

-------------

So from what we know in S7E7 according to Bran:
-Jon Snow is the son of Rhaegar Targaryen and Brandon's (Bran) aunt Lyanna Stark.
-Born in a tower in Dorne.
-Last name isn't Snow but Sand; Dornish bastards are named Sand.

According to Samwell Tarly's correction:
-Transcribed a High Septon's secret diary at the Citadel.
-High Septon wed Rhaegar and Lyanna in a secret ceremony.

Bran's 3-eyed raven vision:
-Robert's rebellion was built on a lie (thought Rhaegar abducted Lyanna).
-Rhaegar did not kidnap Lyanna or rape her, they loved each other.
-Jon Snow's real name is Aegon Targaryen.
-Lyanna asked her brother Ned to protect her son.
-Never been a bastard but is the true heir to the Iron Throne.

-------------

So the confusion and questsions here is this:
-Viserys was the mad brother that sold Daenerys to the Dothraki (Drogo) to gain the Iron Throne, correct?
-Rhaegar already had a son with his previous wife Elia Martell whose named Aegon, does that make the whole Elia Martell marriage invalid or never existed?
-Does Jon Snow err I mean Aegon Targaryen sticking his half dead penis in Daenerys constitute incest? Daenerys is technically Aegon's (Jon) aunt-cum-lover then.