I really like your interpretation of the theme! I really couldn't figure out how to get past this bit, tried to dive into the water and swap but I couldn't quite manage it, not sure if that's the intended solution? 
You have to go left and there will be a bird you can switch too and then you can switch to a fish which you use to go through the water