Well, I really don't see how they can push Snape aside in OotP. If they don't have the Occlumency lessons and Snape's Worst Memory in that movie, I don't know if I'll be able to stand it.
I imagine they will concentrate on Harry's battle of wills with Umbridge, the DA and hopefully, his visions and finally the battle at the Ministry.
I really hope they have the scene at the end with Dumbledore explaining about the Prophecy, too.
Reading over my wish list for OotP, I wonder if it will happen. Gah, I have to hope.