I am leaning toward a new bike. The cost of a new battery, the cost of upgrading the electrical... found a nice new one close by with 48v, 350W, 7 speed. $1899 new.
Now that I have an idea what I need, I realized that the power part was secondary to longevity of the battery.