If I am reading correctly, it looks like it will be a Weir Arc. I think Tori may simply be upset that her character was downgraded, but the way people shuffle around, it could be that Tori returns next year and the present Weir is an imposture. Who knows?