This is the best the scene can be for now, as there is missing footage from the start of the scene that makes continuity tricky, as well as the unfinished VFX towards the end
Wow, that is really impressive work that definitely needs to appear in a TLJ edit.