Don't step on water

Another approach would be to do traces in front of the character and stop the movement components movement when hitting water