Much better but I thought in this take Luke had returned to Dagobah pretty much straight after ESB so perhaps "As Luke Skywalker completes his training on Dagobah" (which trims the final paragraph too).
That would necessitate a slight re-jig of the line about the Alliance (too many 'as's).