I would say the idea probably occurred to Joss somewhere in the middle of Buffy, but by that time he'd made Giles too "safe" to turn him into an outright villain so he just filed it away for future reference.

Yes! When I saw that particular twist in the series you're referring to, my first thought was that it was a subversion of the Buffy/Giles dynamic.