I say we wait to be sure from nintendo themselves. things could still happen, we could get some big surprise even the leakers don't know about.
I know its crazy but I think if terry is in, they would bring a tag team mechanic in to simulate the team base of the KoF games and the recent SNK heroines. I know the normal KoF games don't work like Marvel or DBZ, but I think a bit of leeway could work. Like, I can see Terry fighting, and then Mai or someone assists from the background with some throws or moves, and down B swaps them. a two person swap is less complicated then a 3 person swap as some have suggested, and I can see both honestly fighting almost at the same time, like throws if Terry grabs Mai comes out(or whoever it is) to pubbem, or the smash uses them both to attack, so its still 1 fighter, or more like 1.5 fighters.