Just finshed book 3 yesterday. I have NOT seen the movie.
I think you are 100% correct. Nice summary.
I thought the movie was wonderful and even better than the book if that is possible. The scene where Rue dies and Katnis mournes over her body sent chills up my spine. As she is walking away into the forest she turns looks up and gives audience back in district 11 a 3 fingered salute. Best scene in the movie.