I think you are doing the right thing testing with different props. One thing I don't see specified by you is the c rating of bat. that is also a n important factor. One more thing is the static tests will likely be higher than when in the air where it can unload. You should do fine.