You're right. However, to add to the confusion, Ryan said it would be in a new location, one they had been in briefly. That leaves several possibilities. Jane also said we'd be surprised at who the choir directors will be for Vocal Adrenaline and the Warblers. My guess is VA's new director will be Will. I don't know about the Warblers. If Will is their director, that may be the new location. Who knows!
I'm hoping Ryan will not keep us in suspense too long.