Perhaps add a Chocobo Stable in each city where you can whistle for your Choco and have the CutScene exit from there (Similar to *GASP* FFXI).

In the future if we have Breeding, Feeding and Grooming we are gonna need Stables for those activities anyway so put in the framework now.