I have two suggestions though
Could you reorder the Post-Zhora scenes, so they are in the scripted order (always wanted to see this):
i.e.
(1) Zhora dies
(2) Deckard spots Rachael in the crowd, and follows her
(3) Deckard is caught and beaten up by Leon, but saved by Rachael
(4) Deckard goes to buy some liquor
(5) Deckard goes to talk with Bryant in the spinner
The original film sequence being 1,4,5,2,3 of course
Also the "nail through the hand" scene, should be placed after the "head through the bathroom wall" scene, for similar reasons. He gets the nail in the bathroom for one reason
