I think the Battle of the Five Armies may happen in the third movie as well. I'll bet Jackson expands on the journey home, since it's pretty glossed-over in the book.
I'm planning on re-reading the appendices at the end of The Return of the King as a refresher. It's been years since I read them. There's a LOT of stuff there that Jackson is said to be using in the movies.