Saw Gerrara is bald in flashbacks and bearded in the “present”, therefore I believe most of the early trailer shots are from a cut that has some Jyn in training and/or her abandonment. The dialog “What will you do when they catch you? What will you do if they break you? If you continue to fight, what will you become?” sounds like training or his final speech as he leaves her behind.

I believe that the TIE on the transmission tower is a trailer-made shot, along with the promo shot of the Rebel leaders crowded around a hologram of the Death Star.

There are various promo shots showing what looks to be Vader and Krennic having a conversation on the Death Star. I don’t believe Vader ever is on the DS. There’s also dialog between Krennic and Vader that isn’t in the final cut, where Krennic is trying to convince Vader how badass the DS is.

All of the early promo material mentions how Scarif is the new construction base for the DS, which I think was changed to it just being a archive. Also the early trailers and promos mention how the Rebels know that “major weapons test is imminent” and they need to know how to stop it, making me think that originally Galen Erso or someone sends a message saying that things are bad, but maybe they need the pilot to find the location of the test. But if they know a test is imminent and know they need plans, why would they be reluctant to send the fleet to Scarif since they don’t have to believe Jyn’s word?