I think you'd do an outstanding job will any and all of these ideas. You know me, I just really want Giles to be the one to catch her. He'd reprimand her, but be really cool about it because, really, Willow could never be as bad as he was. But Willow would feel like he was disappointed in her and blow it all out of proportion. Then Giles would probably have to do something sneakily cool to get her to feel better.

...Or something like that ;-P