Nah, Sanji low diffed Page One and made him disappear for a week before Onigashima. Zoro on the other hand needs his extreme diff rematch with Orochi to regain his lost honor. You don't want Zoro to be called a liar who doesn't keep his promises, do you?
Yes you’re right, he will learn the true history and will fulfil the will of D. with Luffy together. His goal is the same as Robin but he doesn’t want to be king of pirates or the best in anything. He wants to understand his destiny and give the sacrifice of Cora-san a greater meaning. That will be Laws new role in the next Gen