One of the missteps I feel the OT took was in making the lightsaber a technological weapon rather than a purely mystical one only trained Force-users can wield. Perhaps Luke using the weapon can be removed from the film altogether? Change it so Ben shows him the saber, but Luke can’t turn it on, so Ben is the one who demonstrates its operation. That would also entail cutting out Luke practicing with the lightsaber on the Falcon, though. That entire sequence provides more information on the nature of the Force and insight into Han’s character, so I don’t know if we can afford to lose it.