Honestly, I think Terra is Xehanort Why else would Aqua's armor be Xemnas's 'friend'? Course, Vanitas could be argued at being Xehanort, but if you include there only being two known rooms, then why wouldn't Ven/Terra have a room? Or why would Vanitas even consider those Aqua and one of them his friends?