ORIGINAL: xby-1
... If there is a significant current drop in the air I could prop up to increase performance.
I would not recommend doing that. It would be better to use a larger motor to improve performance while safely running below the maxium rating. The in-flight drop in load is not a constant percentage and depends on the kind of flying you're doing at any particular instant. Use the static current draw at full throttle to set your maximum safe current level. You could match that while flying, but you can't exceed it.