When did Master Xehanort give up on Terra? Terra is still possessed by him, I don't recall it being proved otherwise.
Isn't the reason Apprentice Xehanort hasn't returned because Ansem and Xemnas was taken to the future and hasn't really been defeated yet? Once they return to their own time and...