I think that it was a time issue…. too much story and not enough time to tell it.
I also think that some scenes are added to camouflage the story from on lookers as they tend to post spoilers…. they shoot a fake scene to create a buzz.
THE uniting of Emma, Snow and Charming should be EPIC not a afterthought like the BLOWING THEM OFF scene would be … I think they are saving this til next season AFTER they have the time to give us the story we deserve.