Here are the presentations as to how the trailer shots were re-incorporated back in, along with an attempt to include the unreleased scene of Draco throwing Harry his wand.
Fenrir Greyback Disarming Ginny (The Half-Blood Prince):
https://streamable.com/39v21i
Destruction of Hogwarts Shield (The Deathly Hallows - Part 2):
https://streamable.com/k885e8
Draco’s Redemption (The Deathly Hallows - Part 2):
https://streamable.com/tmog0s
Harry & Voldemort’s Confrontation (The Deathly Hallows - Part 2):
https://streamable.com/c4ss2n