In the meantime, here's some more madness for your consideration (or your obliteration) along the way....
I don't know if you've got round to working out what you want to do with this particular scene yet, but here's a possible solution to Luke's 'missing' Lightsaber as he crashes through the 'window' during his duel with Darth. See what you think -
....with Darth having seemingly deactivated his Lightsaber (perhaps you may choose to show that happening at this point) before he moves to cling to the wall during the initial wind turbulance....just after we see Luke lurch to the right of the frame with his 'activated' Lightsaber for the last time, and we then see him start to get sucked out of the window backwards....could his Lightsaber now be seen slightly separate from him, IN THE MIDDLE OF DEACTIVATING, as it has blown out of his hand with the force of the pressure amongst the other assorted debris?....and before the shot ends, could we see that Luke's Lightsaber has TOTALLY deactivated during it's fall alongside Luke?....then after Darth looks down....in the 'birds-eye' shot we see of Luke hanging on the gantry, could we see that his deactivated Lightsaber is sitting somewhere near his right hand, having thankfully landed on the gantry beside him. It has been a close thing....as it's shaded silver and black hilt is seen at an angle (underneath the railing, and partially obscured in the same way as Luke's right hand is partially obscured by the railing as seen from our POV), with part of it actually overhanging the edge of the gantry....and when we cut to the next 'close-up' of Luke hauling himself up, we now see the shaded silvery tip of the hilt, with it's buttons, hanging over the edge on the right of the frame, as Luke careful misses knocking it over with his right arm (the footage is ideal for this)...setting us up for when he later re-enters the gantry structure's 'opening', armed with his Lightsaber again....
And any Lightsaber activation or deactivation mentioned here doesn't even require accompanying sound effects, as the wind effect sound is very loud at these points, and will seem to have drowned them out.... :)
ADDENDUM: Of course, there are other possibilities that could be done to show what happened to the Lightsaber too - Such as during the 'birds-eye' shot of Luke hanging onto the gantry, the Lightsaber could be seen to be hovering somewhere just above him, suggesting that he is holding the Lightsaber in place 'with his Force powers'....and we see it gently lower onto the gantry near where he is hanging, just before the 'close-up' of him clambering back onto the gantry....
OR
During the 'birds-eye' shot of him hanging onto the gantry, he looks to his left at one point....where he could be 'suspending, then bringing up the Lightsaber' using 'his Force powers'....and then once he's clambered onto the gantry in the 'close-up' just after, he watches briefly as he seems to be gently 'raising the Lightsaber' to rest on the right of the gantry beside him....
OR
We ONLY see the bit at the end there where he's clambered onto the gantry in the 'close-up', and watches briefly as he seems to be gently 'raising the Lightsaber' using his 'Force power', and rests it on the right of the gantry beside him....
Of course you can choose to leave it all as it is, and perhaps he's just used his 'Force powers' in the intervening time before we rejoin him to 'bring up his Lightsaber' from the fall in some UNSEEN way....but I rather hope you show something or other.