CS.. you might just need to upgrade to a TM with spot lock vs going to the 36v motor. If you think the additional weight of the battery isn't that big a deal then go for it. I don't think you will have any issue with the wire gauge as its been said.. the current draw goes down when you go up in voltage. The wire is rated for much higher voltage than 36, so that's not an issue.

BD