Where about do you live?
If you're going to change the battery and controller, it might be better to go to 48v, which will give you a lot more power and speed, if that's what you want. the motor can handle it easily, and, of course, you don't have to use high power and speed all the time, but...