I think that Grawp will be gone, and that Hagrid won't leave at all.
I just thought of something... What if they cut out FandG's joke shop in HP6? I mean, Harry didn't give them they're start-up loan in HP4, so where will they get the money?
Also, if they cut out Harry becoming Captain or falling for Ginny I will SCREAM!!!!
That reminds me of something else, too. What if they don't put in Ron and Hermione becoming prefects? SCREAM!!!!!!!
In short terms, I'm not keeping my fingers crossed for any of the really good stuff in the next 2 movies.