Well, I still do rather like the three-shot version. (Volcano drone footage > Vader’s Castle from Rogue One with TIEs added > TIEs over forest)
In a version using Nev’s new Biomes footage, it would be two shots: Vader’s Castle from Biomes > TIEs over forest.
It might even be all right to go with: Volcano drone footage > Vader’s Castle from Biomes > TIEs over forest. But you’d only have time to see the front or side of the castle. (The music has dictated the pace of the added footage from the beginning. I synced the soundtrack to where the music is when we see Kylo and extended it backward.)
I think I might prefer the third option overall.