I hope you enjoy watching them. Just so you know, both Yoda fights have been removed. I liked it as a 12 year old but now it seems silly. Hope that doesn't detract too much from it for you.
I tried to use the "Noooo" from the ROTJ BluRay, but there was too much music mixed in with it. Nothing I tried was less jarring than just leaving it alone. Its too bad, but the scene is essential given what else I've done. Q2 didn't have to reckon with it because he removed Vader altogether.