Hi, I haven't following this thread and just read the msg above.
Guess what - I had done exactly the same changes!!

I've also added lights front and rear to both of my bikes. There actually much fun, more fun than driving a car. I'm using Hobbywing EZRUN 18A+18T 81030010 on both bikes with Xray pinion.