I think the Slayer as 'sacrificial lamb' is very pertinent to the idea of the Slayer Death Wish.in Giles' nightmare, Giles says about Buffy that she is a kind of sacrificial lamb.
The Slayer's destiny isn't to defeat just one evil force, but to keep fighting until she dies and her power passes on to the next Chosen One. In this way, the slayer's calling and her sacrifice are one and the same thing.
In season 7, when we learn about the origin of the Slayer line, we find out that Watchers literally sacrificed a girl to a demon all those years ago. Buffy's rejection of this and her and Willow's eventual activation of all the slayers finally puts an end to the the 'Slayer as Sacrifice' and with it, the Slayer Death Wish.
I guess, although I took this scene somewhat differently:Nitpicking: Does anyone find it weird that they made Willow (and other Scoobies) extremely annoying to show an "efficient and brave" Riley?
The Scoobies have been fighting evil for so long and are comfortable with their place and purpose in the group, they aren't trying to prove anything. They know that they aren't Buffy and aren't trying to be the big brave hero, they're just filling in.
Riley's inability to see this and be comfortable with a support role ends up making him look like a bit of a fool. And his roly-polys and hand signals just underline how desperate he is to recapture the command he had while with the initiative.
It's not always easy to know what the writers were trying to make us think with Riley, they're position on him seems to change a lot from episode to episode.