I've said it before and I'll say it again. Bring in Irvine and Zidane and have a side quest where you have to compete with them for Kairi's heart.