Buffy standing up to him in S7 makes me cheer, but it irks me that she still never explicitly rebukes him for abandoning her- I loathe how she actually condones it at the end of S6; it seems like such a self-insert on the writers' part.