I didn't really expect Dumbledore's funeral to be in DH anyway. I actually thought what they did in HBP was really good.

I'm EXTREMELY happy that they're not casting other people for the epilogue. That bit made my day. Oh, and the part about Michael making faces at Dan!