Definitely fix the chocobo situation. Honestly, who would be expecting your choco to accompany you into a dungeon?