In the past I have thought that a safer singularity would be brought about through the use of intelligence amplification, loosely defined as the merging of biological and machine/silicon intelligence, rather than artificial intelligence. The logic being that a human who has undergone IA and reached godlike powers will remember his humanity and remember it fondly.
Will there really be any difference between a human with extremely powerful IA and a straight up strong AI? Once either being reaches the level of intelligence and power where they hit the explosive curve of exponential growth I don't think that it will not make a difference. Their intelligence will have come so far that the origin of it may be insignificant.
However, I also tend to believe that a super intelligence will be inherently benevolent.