I have figured out what niggled about the music in the lightsaber fight though - its not that it is there, as I said b4 its your edit and I totally understand why you've put it in - but the music continues at the same volume as Han Luke and Leia turn up, and 3PO and R2 start moving to the Falcon. So you've got really heroic 'action' music as R2 and 3PO just stand there......its something they do in Torchwood: they had exciting music playing as a fella opened a drawer last week..
Is it worth knocking it back in volume for that bit?