apparently Amy magiced him away in that flash of light when Willow said 'bored now'

As I point out in my most recent LJ, this is utterly incompatible with the sequence of occurrences in Villains. Willow turns back to Warren and burns him deliberately.