I think if you start watching again right where you left off and completely ignore everything you've seen so far, the story will make perfect sense.