I never thought of the symbolism of good and evil fighting in the senate. If the whole scene is to be removed, I wonder if, given its symbolic power, some shots (those that do not have lightsabers) at least couldn’t be refurbished in some way to be used in a dream/vision/premonitory scene of some kind.
Probably some vision Yoda could have, but don’t know. Just thinking outloud