I think you pretty much have it, although I did it a long time ago. Check
here to see if there is anything else you want. I used Android Commander to do my installs but I remember ADB was essential in any case. Also, a lot of the time, the new install won't work for apps, so sometimes you need to delete and then install. Never delete the main app, the Launcher or you have nothing to use to get back a new Launcher. I always kept all my books on an SD card; you should assume you will lose everything on the internal memory.
I just removed the FirmwareUpdateService.apk myself with Android so you have that step.
I think you are OK. Make sure your SD card is fat 32. and don't mix up the bravo update files.
As I look at the apps, I seem to recall that WiFiLocker was the culprit responsible to draining the battery. Something about a default that turned it on rather than off, so I would delete that. When I did, the problem went away. Once you have the new Launcher in, deleting is easy, they never tell you about this one, you hold down an icon and the "add/ delete" overlay comes up.