What you had in mind is better than what I put in there, I’ll use your idea.
Squeezing in the clip wouldn’t work, though. I’m using Harmy as a base and I believe you used the 2004 DVD as a base.
Edit: Done! It’s got some shots of the battle, and also fixes the continuity error. Also removed “Now Witness the Firepower”.