Ended up with a second phone that operates basically as an android-ipod touch. Though, I'm living out of the country so both are in that mode.
One stopped charging altogether, so I would just charge both batteries and have extra battery life in the other. The one that did work, though, would...