not being able to differentiate even during intimacy when earlier, we had Buffy seeing Giles despite his appearance and being mid-slay.
That's a very good comparison... although Riley was very good for Faith!

Spike was quite the Devil's Advocate, wasn't he? Hehe.
Indeed. Very Angelus-like actually... not lying, but using an unhelpful part of the truth.