Ryota Furuya should be added as a composer. We still don't know who did what, but the notes in the 20th Anniversary Box confirm that Furuya did composition work, though his role was small. See the thread here for details:
https://vgmdb.net/forums/showthread.php?t=15283&page=2