OK, now I finished it. Looking forward to that cake :D
Just for my own peace of mind: Is there a way to go back from the last section after I closed the two waterfalls? I figured I could try the dive ability on previous areas, but I couldn't find a way to return.
Also, is there a way to get to the chest in this screenshot?