I’ve kinda said since 2016 that you could combine Cassian and Jyn into one character and the movie would be a lot better for it, but I also sort of think you could combine Baze (gun guy for OutboundFlight) too.

Jyn is only really there for the plot, because her father built the Death Star. Cassian is more of an active protagonist than her, but Baze is the only character with a real arc.

You could probably combine Saw Gerrera and Chirrut (force guy for OutboundFlight) too, making the story more focused. The daughter of an Imperial scientist is taken in by a religious guy who’s an early rebel after her parents are killed. They part ways as she grows into adult, and she loses faith in the Force as she wanders through the Empire. They reunite after the Rebellion gains intel on the Death Star and her father goes missing. Over the course of the movie, she regains her faith in the Force and leads the charge on Scarif.