Forerunner 965 issues after update

Since the latest update my 965 has struggled to get a GPS lock.  I've gone on my normal routes and during one 35 minute run it never got a signal.  Then today, it was about 30 minutes into the run it for a signal.  I've reset and reconnected and nothing.  This only started after the update to 28.05.

The previous update had made my HR sensor unreliable.  I start my run and it jumps to 150 then maybe 10-15 minutes later it's back down.  On other activities it's reading maybe 60 BPM, but by other methods im easily double that.

With these two issues it's become nothing more than a stop watch ( an expensive one at that!)

Any thoughts on what to try before I do something drastic?