Oh my god. I can't decide whether to hope this is true or pray that it's not. It's genius...

(I'm not sure I buy Warren as evidence, though, because he's still evil - and not particularly in a cleverly amoral way, in a scalpels in Willow's eyes kind of way - and shacked up with Amy. Which I imagine would not be Andrew's ideal situation. Then again, if he'd turned up in a super-suit of his own design fighting evil and asked Andrew to join him, that would've been too much of a giveaway...)