I really dont think you can say he had it all planned when he gave his word in the meeting with the five families.
Vito (or Mike) didn't have it planned at that time... Vito's main concern was bringing Mike back safely from Sicily. That was utmost on his mind... once that happened it was just a matter of time to plan his revenge.
