I thought Yoshi-P had mentioned switching your Chocobo's job/class. Can't find the comment though. I actually kinda hope they let you use the current Chocobo for both. He had mentioned in the same article that you would ride the chocobo, and when dismounting it would stick around.

Besides i would rather not totally relegate my good and loyal Ico to the Feather heap. Hes a good Bo and i'd like him to be able to keep on Choco'in.