I'm stuck running around route 7 with the oshawott following me and I cant progress back to the beach to turn the Pokemon back to the Samurott. I've ran all over the place and it wont let me surf no matter what. Is there anyway for me to progress forward?