I think you're probably right about Giles and Spike.

BUT

Just as he convinced himself he was in love or at least lust with Anya, which (of course) he so wasn't.

He so was! So was she! They belonged together! Ah, cruel fate!

I'd been wanting them to get together for about a year before that ep aired. I just about fell off the couch when they kissed.