Now I'm just saying this to say it, but if one were to start with the capture of Chewbacca and then Luke seeing Yoda die, then it might work best to cut away to Luke before the failed rescue of Han.
That way things would really look bad-- first Chewie is caught with no apparent hope of rescue (avoiding the silly reveal of Lando); then we find otu Luke isn't even there --and Yoda dies; then Leia gets herself caught... Jeez!(cut the Han/Chewie reunion scene). With the darkest possible music over all this, it would feel as suspenseful as it was supposed to.
Then come the droids walking right up to the mouth of the lion... Their presence indicates that Luke has arrived, but he's already way behind. But at least his plan now makes a little sense-- gift the droids, go in and try to get everyone else out -- if it all fails, R2 has his light saber hidden away as a second chance. (Provided Jabba makes R2 a drink server and takes them all to the Sarlaac pit and etc... I will never really understand Luke's plan).
BTW: Thanks, Sluggo-- Starkiller Ranch lives!