True, it is a big part of the story, but we need to see how her arc in Episode 8 plays out to know how much importance is placed on a weapon. Perhaps she is embracing the Dark Side in her fight with Kylo Ren, so she’s going down an Anakin Skywalker path. In this case the importance of the lightsaber in this scene is justified. Otherwise, I think the focus of this scene should be the safety of Finn and company.

My main interest is in keeping the entirety of the music in this scene. Whether or not the lightsaber shot remains in V2 is an issue I am willing to concede 😃