Yes, but at some point you have to consider whether it’s worth removing parts of the film in order to accommodate for something that only some people take issue with.
On the other hand, Jar Jar, flip that around. A lot of people think the dagger plotline is stupid. Is it worth including all of that nonsense, just for the sake of one joke that only some people care about? If we have to cut a single joke in order for the story to actually make sense, I personally think that it’s worth it.
So it seems like the consensus is to use V2, but keep the “Heads up” line, and trim the gap before Rey starts talking?