Oooh! that's not that long now you mention it!
I know it's not in HBP, but I listened to Malfoy Manor/The Wandmaker (Deathly Hallows chapters 23/24) last night, I was a wreck, I don't think I'll be able to cope with watching it actually happen on screen, but those Tottenham Court Road pictures...