I'm pessimistic on this point as well. Like Eilowyn said, Buffy's snapping to herself in #35 was undercut by her complete failure to upbraid Angel for being a dick. And like you, for me this is about Buffy and not the ship. It's possible Joss's story is going to be about Buffy's blind spot with Angel and the damage it causes -- but one would hope at some point that the story would call attention to the problem with Buffy's acquiescence on all of this.