I think there are options in the Jerjerrod scenes, but I will do the work of making specific suggestions to back up that opinion. What you have is totally brilliant in that it solves the Ewok problem with new and better footage (instead of just cutting all the Ewok material down).