Jon's real identity in the books

I've read all of them, question for others who have.

Do you think Jon will still turn out to be Aegon in the books? It seems like all signs point to yes. But then it makes the book-only storyline of Jon Connington and young Aegon literally redundant, which kind of blows as I thought it a neat dark horse sort of thing.