The fix is easy. Just join me and pretending that Season 5 onward never happened! And we can just pretend that Dean was actually getting a divorce because he found out his wife had been cheating or something. (At the perfect wife act was just an act because she was feeling guilty.)

Though the season finale was kind of wonderful, if you just ignore how everyone got there. I like to pretend that Rory ran into Tristan on following Obama on the campaign trail and they eventually wound up together. (Because you know that Logan was just a Tristan wannabe.)