Fenix 7 stuck on wait for GPS

Recently purchased a Fenix 7 Standard as an upgrade from my Forerunner 645. Seems to be tracking everything ok, but have only been having issues with GPS. First activity tracked fine, but the second had issues of GPS jumping around very erratically (adding 5km to an 8km run) and some testing while going out for walks replicated this issue. After some research I tried a GPS soak which seemed to fix the issue and going for a run the next day tracked perfectly. The day after though and any activity I select is unable to get a GPS lock and is stuck on the "wait for GPS" message but after 20 minutes there is still no lock.

I've tried updating to the latest firmware, resyncing with the connect app, connecting to the Garmin Express app, multiple factory resets and multiple restarts and I'm kind of stumped!

Anyone else had a similar issue they were able to fix?