I've been using this for about a year but now it's available to all on the Garmin store for round face watches running connect iq 2.3 and above
Surfing tracker which keeps count of your waves and stats and uploads the track to your connect with the correct sport type set and custom fields added.
https://apps.garmin.com/en-US/apps/edc1147f-466f-4a37-9d3d-0487c4fa6c3c
Feel free to ask any questions/ make any suggestions in this thread, also if anyone is willing to help test it would be helpful as there's a few new features I will be implementing but need tracks from different surfers to test with.
APP is free, no features locked, but donations are of course always welcome