Awesome ideas!
Only thing I'd disagree with, is this part:
Only when Luke speaks to Yoda it is revealed that Luke only made the rescue plan so convolted was to impress leia with his new found Jedi prowess. Luke realizes he has done wrong after Yoda has died.
Or how about making the plan less convoluted :D
I've always thought it was a bit too much... first the droids walk in... then Leia with Chewbacca... then Luke... and Lando was there all along.
Why didn't... he just free Han before all that? Why didn't Leia infiltrate the palace in her mask first if they needed the romantic scene?