Fenix 5 Plus open water inaccuracy

My new Fenix 5 Plus is very in accurate in open water. First time I did around 1,500 meters but it just showed 250. Second time I did around 2,500-3,000 but it just showed 1,500. However the map seemed to track what I did correctly. Also, I had 1,000 meters alerts on but instead it gave me 500 meters alerts. Data recording was set at "every second" mode and I tried all three GPS modes. I also have version 4.20. First reply from Garmin Spain was: "GPS measurement in open water will never be as accurate as when running or cycling because GPS looses connexion when paddling, so we don't think your watch has any problem". Anyone else?. Not surprisingly, the Fenix 5x Plus is also having open water issues.