I agree with restructuring the battle a bit. The “cavalry to the rescue” trope works best when the characters have all been through their darkest hour for a while. In the original movie, Poe goes from mourning Snap to losing all hope to happy again when Lando arrives, all in a span of like, one minute.
That was the only scene with Snap that I liked, haha. So many of the director’s friends had unnecessary cameos.