Oops, didn't realize you can't move against the current, though I knew it pushed you back a space at the end of your turn. No wonder we found that part of chapter one so easy.
That was my assumption I assume this includes moving diagonal against the current too.
Question: Can you take a further move with surge after moving into water? I assume the answer is yes.