RE: prop question
I would first try putting the new prop and motor on a watt meter. That way you can see the current change and prevent drawing to much for your setup. I believe a Watt meter is a must for electric flying. You can find them online for around 40 to 50 bucks.