I like that you cut the sword and went with Luke hiding 😃
That’s my favorite solution for this sequence!
May I suggest that you end it on Rey seeing the X-Wing under water ? That way we get from the start that Luke has changed.
You can cut Poe’s joke and go with the original Fin intro scene. Works much better as a reintroduction to the character.