I think that particular scene does break some of the serious tension happening, but with how it plays out and leads into McGonagall talking to Harry I don’t know how I’d remove it. I guess I don’t really mind that scene though.
The only thing I really wanted to change, and I might go back and try again, was the Harry flying through the air with Voldemort during their fight, and blending into each other. I liked most everything else about the movie though.