Now I'll have to re-start Heaven's Feel for the 3rd time and try to finish it so that the movies will make sense.

They'll skip something. They always do.