For Vader’s castle - there’s a lot of flashbacks. Would it be worth showing Vader’s castle, then a flash of Rogue One’s bacta tank, then a flash of Vader’s helmet, then finding the way finder?
I think that would be a bit too much. Maybe a quick flash of the castle and that Wayfinder-like silhouette indoors in a vision or something but nothing more.
Here’s another possible placement for the fortress: https://imgur.com/a/8nzOLAB
Perhaps it could get shrinked down a little more in order to not be distracting.