I like the edit you made in the ending, connecting the parts of the flashback. Flow much better than just put one part right after the other.
But the insert of that bit where they smile at each other during the battle didn’t fit well for me, particularly.