Good disk brakes aren't a cheap endeavour though, and bad ones can just be.. bad.

If they're going to revise the wheels though, having a larger rim diameter than 16" would really help with the handling characteristics, likely more than shaving those pounds from a battery upgrade would.