To me Scott's idea that Deckard is a replicant but doesn't know it is just weak. Even the idea that they would make a replicant hunter that's weaker than the "basic pleasure model" it's designed to hunt doesn't work.
I think Scott shoe-horned his change in after the fact and he's had to keep releasing new edits because it doesn't really fit.
PKD's original plot themes are much richer and deeper:
The purpose of this story as I saw it was that in his job of hunting and killing these replicants, Deckard becomes progressively dehumanized.
At the same time, the replicants are being perceived as becoming more human.
Finally, Deckard must question what he is doing, and really what is the essential difference between him and them? And, to take it one step further, who is he if there is no real difference?
— Philip K. Dick