This isn't really a bug this is a challenge you have to learn to overcome yourself. Grab a better water type that can learn surf (Oshawott is a possibility, you can get the lost one from the event with the beach in Darchlight), and train your Pokemon up. Nothing to be "fixed" here, as I was able to handle this fight with my team including my water type with Surf.