Has anyone found a reliable way to solve button issues?

I love my Fenix 7X Pro Sapphire solar. I especially love that it was a free replacement for my 6X when it failed under warranty BUT it is pretty unreliable. I've had it just four months and had numerous software issues and eventually rolled it back to 16.22 firmware which has resulted in it being stable over the last few months. Unfortunately it's now started to develop physical button issues.

It started with the menu button being unresponsive after a sea swim and after following the guidelines to soak it in warm water that fixed the problem. Unfortunately it's now developed the same fault but with the start/stop button. It clicks in fine so feels like it should be working but doesn't. Occasionally it works (around every 20 or so presses) but it's totally inconsistent. I've soaked it in warm soapy water, tried WD40, silicone lube and still now joy. Oddly it works fine for five minutes after soaking in water but once dry stops working again. It works fine under water, so if swimming, just not when dry. I've logged a case with garmin but wonder if anyone has actually found a reliable way of solving a similar issue? Failing that does anyone know which of Garmin's watches have more reliable buttons?

My 935XT and Fenix 6X never had this issue (although both had other faults). Love the watch but don't really want to keep upgrading/replacing etc every few months.