viz, sounds like you remember correctly.
HJ, Sansa looked down on Jon. They were not close in any way.
Since that time, Jon has developed an affinity for redheads.
If Martin follows tbe basic formulas that 99.9% of fantasy writers (heck, fiction writers across the board) follow, then Dany and Jon are a lock to end up as a couple. But that's still only two heads of the dragon. Since Dany has interpreted Mirri's curse to mean she's barren, then it makes sense that the third head must be a fertile female for Jon to sire an heir upon. The list of political candidates of suitable houses and ages is a short one... Sansa, Arianne, and Arya. Quick back room deals might land Margaery, Asha, Shireen, Jeyne Westerling, Myrcella, or even Cersei on this list, but I highly doubt it.