I agree about the unicorn scene too. The replicant idea kind of ruins the whole film for me.
I've heard it argued that the origami unicorn at the end doesn't make sense without the unicorn dream sequence, but prior to anyone ever seeing the unicern scene in the DC, we saw Deckard pick up the origami unicorn Gaff left and we simply assume it means Gaff has been there and let Rachel live.