The 5 Year Gap stories can be explained away pretty easily since there was considerable time manipulation done at the beginning of the series that was reversed at the end of the series.