This is so much better being plot driven. SH, when all's said and done, is a wonderful piece of wishful thinking with some plot draped over it as an afterthought. I also think this version of CC works well in the post HBP scenario. I read the original post OotP chapters when you first posted them, and liked them, but it wasn't clear what sort of plot there was going to be. As you've written it now, with the quest for the Horcruxes, it totally rocks, numerous Americanisms notwithstanding ;)