I really love that restructure idea Neverar, specifically Finn already knowing about the tracking. I do wish there is a way though to retain Leia’s scenes before she is unconscious.
Because IMO it might be a little too much change between movies as well as the added difficulty of doing a flashback.
Really great ideas though, I like the way you think.