What about, after a predetermined amount of time, having the chocobo/mount theme fade out, and then afterwards the normal music would kick in? It was that way in FFXI iirc. That's the best of both worlds if you ask me.