I agree, the theme of the season is the consequences of Willow's spell and there will be good as well as bad ones. But I doubt that this current season will end with unmaking the slayer system. I read that Joss is already planning the next season, and I think he'll keep "the show" running for a long time.