The elevator stuff can be used to keep the tension. You just need to be smart in cutting it.
Don’t want to steal your thread, but take a look at how I did it for personal edit:
https://streamable.com/fi1ba

Yes, there are 2 repeated takes, perhaps you can find a better solution 😉

For the escape I removed the Phasma fight and BB8 on the walker. Here you have only the relevant parts:
https://streamable.com/fx59r

There are a few problems with this, but as I mentioned before, it’s ok for my personal use.
Just sharing it in the hope it helps!