Peter Jackson on the two-film edit:
The split was going to occur where Bard [Luke Evans] appears on the river bank as a silhouetted figure with a bow. So the whole barrel sequence was going to be the climax.
Just in case someone wants to re-create the alternate universe two-movie edit.