I agree 100%. I’d go a bit farther and say one of the points of the movie is that it doesn’t really matter if Deckard’s a replicant.
At the end, Deckard suspects he’s a replicant, but the unicorn could be coincidence. Gaff could just be messing with him, or maybe Gaff’s having the same dreams as Deckard.