I don't really subscribe to either theory properly.
the singularity is not a thing in my book because i believe that as technology advances, the distinction between technology and humanity will fade. I actually think the concept of humanity will start to become more fuzzy as animals of other species start to become considered to be more like us than different.
I mean, people have pets that are treated as part of the family. in time, the separation from us as a species will become less apparent as technology can be used to augment various things including intelligence and communication.
The uncanny valley thing, I merely think what we are seeing is the visage of a corpse. it looks like a human but we can't see the signs of life. therefore we only see it as a dead human. what is worse, it is animated so it is like looking at a zombie. the difference will always be if something has life or not. the presence of life depends on the animator. a good animator can inject life into a construct. a bad animator cannot.