And about the FF songs, it could be that they have something planned for Square related stuff later and don't want to give anything away for now. I could easily see them dropping a Zack echo and then bringing up a bunch of new FF stuff like assists or even items. They are not on the final build after all, and other things could take precedence. Plus, that is FF music, music that has tons of different composers to ask and is apart of one of the biggest RPG franchises of all time, compared to SMRPG and it's one game(That while has some historical importance, does not factor here). Plus, from the Sakurai and Nomura interviews, Square was very hands off when it came to how Cloud was made, so Square isn't even that bad when it comes to the characters themselves.
Edit: So yeah, I am a leaning on Geno. Still want to see both in the game though.