It HAS to be Andrew!
From geek loser on Buffy, he takes Dana, the psychotic slayer, away from Angel Investigations and in TGIQ, he ends up with two girls in his apartment, sort of reminiscent of Johnathan in "Superstar" who has two Swedish girls (was one of them you, Taake?) waiting for him in his mansion, but unlike Johnathan, he does it without massive mind wipes of everyone around him. It is every bit as extreme as Wesley's transition from bumbling buffoon to badass but it does not seem to be as jarring a disconnect.
And then he wipes out ALL of that supposed character development by replacing Buffy with a robot without even telling BUFFY about it. And he still doesn't see why that would be wrong.