I don't disagree with you. I prefer the story as it is, with Spike going for the soul.

I can also construct a scenario where Giles is really an alien robot.
No point? No point? It totally justifies why he leaves for "England" and why he comes back wrong, programming bugs. :)