Another thing to take into account ...
Power system derating
It is a good practice to have some headroom built in. Motor runs cooler, slightly more efficient too, and you have some leeway should things go south a bit.
About derating motors, controllers, batteries, electronics in general:

• Derating, starting at ... Then there is the 75% rule of thumb ...
  Questions and Answers.... - Page 928 - RCG
  
• About de-rating controllers and motors, starting at for everyone else:
  Questions and Answers.... - Page 290 - RCG
  
• Motorcurrent is proportional to voltage squared, and proportional to Kv cubed.
  A 10% change in battery voltage will give a 20% change in current, a 10% change in Kv will give a 30% increase. Not quite, because battery voltage will sag more due to higher current, but you'll get the idea.
  
• extra current with one or two cells added, simple table
  A.k.a. "Why did my motor and/or controller and/or battery go up in smoke ??? ¨.
  In depth discussion
  www.theampeer.org/ampeer/ampnov15/ampnov15.htm#ADD

Vriendelijke groeten Ron
• Without a watt-meter you're in the dark ... until something starts to glow •
• E-flight calculators • watt-meters • diy motor tips&tricks • Cumulus MFC •