Like you said, I think JKR has some control over how stuff is done in the movie, and with such an important scene I'm sure she's going to have to give them some direction on it.

Speaking of the last book, did you hear about those supposed spoilers that were released a couple of weeks ago?