Me and Cid could do a tad bit of godmodding for a post or two of controlling Raven, and make it as though Raven doesn't become a guarian, he just wanted a little 'chit-chat' with us and some company. And then Hana and Yu could just set off and continue with the pilgrimage.

I don't think there's much more of an easier way around it, especially because at the moment we're on our way to Ravens' house...but err, what do ya think? Anything else we could do?