Well, I just discovered the Adywan edit and I must say that it is near-perfect!

The ONLY thing that would have put his edit over the top for me, would have been if during Vader's first entrance - that for sake of continuity - Adywan had added the music cue from Empire when Vader enters the Bespin torture chamber to view Han's torture.

I temped the track to ANH and it works and fits perfectly - even to the point that the French Horns in the cue that follows Vader and his TKs past camera frame almost sound like Williams scored that scene this way.