I really should have added it into the part after he says "Smeagol." at the dead marshes (like what you said)... but I didn't even try... I really just forgot... terrible, terrible.
concerning the part at the Entmoot.... they talk until Merry says "this has been going on for hours" and
Fangorn turns and says "We have just agreed." and it cuts to the part where he takes them to the chopped down forest, he gets angry and Calls for all the Ents. CUT back to Aragorn, Legolas and Gimli at the forest of fangorn....
I'll make a cool Book-cut chronology graph sometime for fun... or when I have some time to spare, to show you where I placed each scene.