I know it's in the manga but the Spirit Tortoise definitely has the feeling of filler. You establish the waves as a world ending threat in Season 1, and then in Season 2 you immediately go off to deal with a different threat that's only tangentially related to the waves? Really weird pacing...