I wonder if it would be a good idea to show Luke’s lightsaber retracting in the final Academy flashback. To make the point of the scene more clear and dispel the misreading of the movie of Luke trying to kill Ben for having a bad dream. He’d have to re-ignite it when Ben attacks him, too, of course.
This issue with this would be removing the green glow on Ben. Otherwise this is an excellent idea.