Okay, so I was feeling over-confident and reversed my workarounds. The mouse failed on me tonight, so the software update didn't fix it, it was the workarounds.
I really hope this gets fixed soon. Amazon has a generous holiday return policy which is the only reason I haven't returned it yet. But the days are ticking down...