This is what I ended up doing - I don't have any soldering experience.
I had the flickering and rebooting problem. Hadn't seen this thread. Bought a replacement battery, which worked for a couple weeks, then suddenly didn't. Then neither battery, nor any type of power charger, could even get...