Once I have the Five Armies edited into the mix, I will go back and try to fit some of the EE scenes you mentioned. I do really like the scene between Elrond and Bilbo especially.
Here's a link to some select scenes from my fanedit that I've uploaded: