Good plan ...  though I can see that maybe nothing will stop Willow's hubris not it's already started.

Like your alternative to the My Will Be Done Spell being turned against Adam - Hope you have an update very soon. 

Well done Spike for realising he'd over-reacted and coming back, and well done Buffy for actually apologising for your own over-reaction and unfortunate words.
Unfortunately, Willow is still in denial and is just as arrogant about her magical abilities as ever. She's going to need very careful handling.
Well, that sounds as if it should work perfectly...