A few other ideas, if they haven’t been stated before:

Remove references to “Three Lessons” and have Rey already sitting on the stone when Luke is giving the first lesson. This can imply at least a little more training than what we see. This could probably work even if the third lesson is restored from the deleted scenes.
Another poster had already posted a good solution to the “Ben, no!” situation by combining elements. But if one wants to keep the rhythm of the three flashbacks: Show the first flashback as theatrical, but use the “saber crossing” version of “Ben, no!”… Second flashback stays as theatrical… Third flashback removes Luke’s thoughts of killing Kylo and igniting his saber, but the rest remains, thus it appears Luke is quickly igniting his saber merely to defend himself.
Before I saw TLJ, I enjoyed this upbeat TV spot, featuring Finn’s “May the force be with you.” It’s really nice out-of-context:
https://www.youtube.com/watch?v=Zj9qejqPNV4
In the finished film, we see Finn’s just saying it to get rid of Rose. Finn doesn’t move much in this shot, so it could be possible to move it to a different place in the film with a rotoscoped background if one would like to see Finn saying it more sincerely to someone.
BB-8’s whack-a-mole at the beginning could be altered to be less OTT. The first shot could have BB-8 lowering himself down and looking around for the problem. Second shot could have BB-8 locate the problem, probe the sparking area once, then digitally add some electrical tendrils to the probe so BB-8 gets cooked a little, to explain why he’s still a little fried when he raises back up. Same joke, just a little less silly with no whack-a-mole and no headbutt.
This would be tougher, but the early scene of Poe talking to Finn with the liquid spewing out of his suit is a bit silly. It would take some doing, but it may be possible to digitally remove the water streams, and perhaps the center audio channel could isolate out the streaming sounds.