Garmin Instinct Losing Course Waypoints

Hi.  I'm looking for some help with using waypoints on my Garmin Instinct.

Use Case: I go hiking in Scotland (Munro Bagging).  I use the Garmin Basecamp to set up courses and export them as .gpx files.  Then I import them to the Garmin Connect website as Courses and add the mountain tops, bail-out points, river crossings, etc.  as waypoints (using "Add course point"). Then I download them to my Instinct Solar.  When I set out I use "Hike" mode on the Instinct and add in the course using the "Options" and then start walking the course. I've got the Instinct screen set up so that it shows me the distance to the next waypoint.  Most of the time this works OK.  

Problem:  If I go off course for more than a few minutes then when I get back on course the waypoints are gone and the Instinct just displays the distance to the end of the course.  I'm not talking about going miles off the course.   I can go off course for any number of reasons - walk along a ridge to see a view or eat my sarnies, check out aircraft wreckage, walk round a bog, find a way across a burn,  I've straight-lined a climb that has long zig-zags, etc..   It's not just me getting lost.   The only solution I've found to getting the waypoints back is to stop the Hike and re-start it, but then I can no longer see my accumulated stats for the hike - which is a bit of a pain given I'm sort of training.

Is this a feature of the watch or is there something I can do (apart from never deviating from the course) to stop my Instinct losing waypoints?

Thanks in advance for any help.