It's for certain that they will add in the mouth of Sauron shot.

I had heard that they shot the final confrontation between Saruman and Gandalf. Now, I could be mistaken. They might not deal with it in the shire - rather, they might add the scene back in right after Gandalf picks up Merry and Pippen at Isengard. Gandalf confronts Saruman there in the book. Jackson might add some of this dialogue back in and take care of Saruman this way.

We'll just have to wait and see, though, I guess.