You were right the first time Tack the cleche bit of Jyn rescuing the little girl has gotta go.
Worse than that is gurerra and his gasmask.

I have also been thinking of real ordering the beginning
Crawl
Krennick visits vader at his hizzo.
Fear of death has him find Orso
Jyn hides and when she fiddles for the lamp she has her flashback (just the part where she lives as an imperial) gurerra gets her out of tunnel
Cassian shoots his snitch
Cargo pilot surrenders himself on jedah
Jyn wakes up on prisoner transport

Hoping for deleted scenes

Would like to replace a lot of music with the shadows of the Empire soundtrack