I would go with "Waiting in the Wings" or "Smile Time" for Angel because, though I prefer Angel to Buffy (my key reasoning being that Season 4 of Angel isn't as bad as season 6 of Buffy) for largely telling more effective dramatic arcs, I was always a sucker for the light and fun episodes.