I personally don't hate the fact that Deckard is an android in the eyes of Ridley Scott, but I prefer thinking he's human. So how about an edit taking out the Deckard is an android stuff? Somehow removing the red twinkle in his eye at the end, the unicorn dream, and maybe with some clever editing, we can make Gaff look like he has a unicorn fetish so the oragami unicorn makes some sense.
This is what I really want to see though: I was reading some of the passages from Paul Sammon's book "Future Noir" about how hard it was for them to track down the unicorn footage for inclusion in the Director's Cut. In fact, it goes on to show that many collaborators on the film were left dumbfounded as to why Scott wanted a unicorn to begin with. So why not replace the unicorn dream with - get this - a sheep dream! Anyone who has read Philip K. Dick's original novel "Do Android Dream of Electric Sheep?" knows what I'm getting at. Heck, someone really good with this stuff can make a few shots of an animal catalog and insert it in a way to make it look like Deckard wants to buy a real sheep as per his reason for taking the job in the novel.
Not entirely serious with all of that, but it could be interesting.
