Firefoot: I don't see much of a problem with your post. You can leave it as is. I don't intend much to come from "The Scream", so nothing big will happen.
I will be finishing the edit on my post as soon as possible, and then get around to doing the post for the next/final day. The Orcs have two options as I see it. My original plan was to have two separate encounters; one with the Goblins, and the final battle with the Gundabad Orcs. However, since I'm compressing the final day, the orcs, as defenders, will have choice of the defense.
Soredamor and Berserker_Warrior: The options are now left to you. From what I see, you can have last minute reinforcements take up positions on Gundabad, or keep your force split and have the goblins attack as the Gondorians begin their assault.