Rewatching canon in bits and pieces as I wrote these various parts made me wince for Buffy - and most of the other main characters - every time. I really disliked most of Season 7 on first airing, and time hasn't improved it much for me. *sigh* Nick and Jon would be good for the Scooby-team and vice versa, I think!