Great meta, as always. Season 7 gets more and more complex the more one watches it.

I did feel that Joss was trying quite hard in this season to put clear blue water between what were then current political events and Buffy's war against the First Evil.