Fenix 5 GPS dropouts

I purchased a Fenix 5 three months ago to use for ultra marathon running. It soon became apparent that on every long run of over 3 hours I would experience some type of GPS dropout of up to an hour at a time. I contacted Garmin support (who weren't particularly helpful) so after a month with still no resolution, I returned the watch to the shop from which it came from. They organised a replacement watch which unfortunately also has the same problem.
*This only happens on long runs of over 3 hours.
*There are no obstacles which could possibly cause satellite problems. In fact I now take either my Suunto or old Fenix on every long run and they always record perfectly so I have multiple examples of Fenix 5 errors when the other watch has had no problem.
I have noticed (via Strava) that I am not the only person to experience these issues with the Fenix 5. What I would really like to know is whether this a problem that will be eventually resolved via a software update or should I be ditching the Fenix 5 while it is still under store warranty?