It's probably more of a 15 year timeline again with most of the pre marriage stories happening in the initial 5 years, with the marriage and Jon's birth happening around year 6 and pretty much everything happens as we've seen it with few changes and retcons.
It's really not that complicated.