I wonder if maybe reintroducing the Wedge shot at the end could let us cut away from the extended shot right before it gets particularly problematic from an audio perspective with the squadrons.
And Poe can still say “hit those underbelly cannons” via comm.
It would make sense to keep that line, it served to remind the audience of the “shoot the cannons = ships blow up” plan at the point where it comes to fruition.
And like I said I like the small Wedge cameo paired up with all the other ship cameos and all the other voice comm interactions. I hope it can be worked back in.