Fenix 5X Plus battery draining

My battery has been acting out of character after the ransomware attack. Noticeable battery draining rapidly from full charge to 10% in 2 days. Normally it takes 8 to 9 days with connection to phone and regular workout (running with GPS). I contacted Garmin support team and they said it was nothing to do with the ransomware which only affected online services. 

So I can only imagine it's pure coincidence that this is happening. I love my Fenix 5X plus. Had it for 2 years now with no battery issues until 3 weeks ago. 

After going through a full reset and removing apps from IQ, the draining continued. Garmin Support then quoted $140 to do a full exchange of the watch as it was outside of warranty. I am not ready to spend anymore money than I already had on this watch. Paid close to $1k for this watch and expected it to last longer than two years, so not ready to spend another $140 for what I think is a glitch from Garmin, which is no fault of mine. Is anyone facing the same issue and got it addressed?

I am almost regretting my choice when I was choosing between the Apple Watch and this. I had been with Garmin since 2008, so this does not happen all the time.