First, you're using a Samsung watch with a Pixel phone. You'll have issues with that alone.
Next I would suggest the feature to Samsung. Not sure you'll get much feedback. The S3 doesn't have any other "water sports" features.
Other than that, look at Garmin Fenix watches.
Oh, wait. What about the Gear Sport? Maybe it will do what you want.