Most pokemon that live in the water aren't particularly dangerous as long as they are left alone, but I can see your point. I'm not sure if there are any surf-capable pokemon around Olivine that can keep you entirely out of the water though. You'd need one of the bigger species for that, but most of the ones around Olivine are around Staryu's size or smaller.