What they should have done...

...was to put the Yan storyline (5 months before) in order and show it as the first half of the film, then cut right into the Ming storyline (10 months after) as the second half of the film. I mean the cuts were so confusing!

it would be somewhat like:
Shen, Yueng and Yan know their identities, shake hands
CUT TO
Brief flashback of events in IA 1
cut to Yueng and Shen meeting on the roof
and finally to Ming supblot.