I think the Luke/Leia conversation is perfect. At the very least, it's the best possible thing that can be done with the scene, and it just so happnens to work really well.
In the Force-lightning scene, there are some awkward music cuts that stand out, but other than that it's very good as well.