Yeah, believe it or not, body-swaps used to creep me out as well. I remember being frightened of the episode where Ginyu stole Goku's body, to the point where when I got a VHS tape featuring episodes from that arc of DBZ I almost didn't watch it out of fear. Like you said though, changed over time.