If the native app continues to be uncooperative, you can always try this method... It won't work for LR devices, but it should work well for everything else.
This is how I did my updates for a long time since I like S2, but the native updater app didn't support S2 devices until recently.