3.1.3 allegedly addresses the erratic battery issue.
Personally never had a single update problem across two iPhones, jailbroken/unlocked/official, all the way from the earliest original software to 3.0 on my 2G, and 3.1.3 on my official o2 3GS. Windows or Mac OSX.
Guess I'm lucky.