I did the reset tonight.. I got the WP update download to start and install and all apps downloaded successfully. I'm a few hours in but the battery already seems to be better. I guess we'll see what happens overnight.
The one thing I haven't done yet (and not sure I will) is set-up Hello. I can't be sure that it was a problem, but when all my problems started it stopped working.
I hate that this was / is the solution.
cS