Sounds like a good edit. Asking for feedback so I will add that I would rather the Rancor remains and the "Noooo" does not.

Seeing as you are including deleted scenes then I would reinstate the Endor Bunker shootout, on the grounds that it's a cool action scene, it features a brand new set environment, and it shows a tougher side to Han (which as you noted is lacking rather throughout ROTJ). There have already been restoration jobs done on this sequence (adding laser fx, music and re-editing), which you can see here: https://www.youtube.com/watch?v=gT-ZsR2P8dU