Middle Button and Shortcut Not Working

Hi,

I experienced several problems since the 15.05 update, and this one is the weirdest, maybe it's a hardware failure.

The right swipe shortcut from the watch face doesn't work -- right swipe does nothing. Right swipe works fine to go back from within menus or the Glance list, but does nothing from the watch face. The middle button does nothing on a short or long press.

I did a factory reset and both started working. By the next morning, both stopped working. I didn't install any watch faces or apps. If it's a hardware problem, I'd expect them to not work at all, but they work for a short time after a factory reset. 

Also noted after 15.05. Turn the watch off by holding the top button until it powers off, plug in the charger and let it charge to 100%. This causes overnight battery drain to go from 2% - 3% up to 12% - 15%. Battery drain is normal the rest of the day. If I don't charge it this way, battery consumption seems normal. Seems like a problem with sleep tracking.

Any suggestions appreciated. I'd consider replacing the watch but its only two years old and there's isn't a suitable replacement available.