Haven’t heard this brought up yet, but beginning in TFA and now especially in Rogue One, the end credits music simply does not fit with the tone of the final scenes. It’s incredibly jarring to have just sat through the killing of all the main characters and a brutal murder-spree by Vader only to have the music ramp up for two seconds to a fun, adventurous crescendo.

If I were to re-edit it, the Tantive would only belatedly enter the battlefield to receive the transmissions and then jump out of system, apparently free from pursuit, to continue its mission to retrieve Obi-wan. We wouldn’t see Leia’s face at all. Then, as others have suggested, we would end with the Death Star firing on Scarif and the deaths of Jyn and Cassian. Fade to white. After a few seconds of silence, begin subdued music more in line with the tone of the ending.