Hi Sparky,
I kinda doubt that's all you are consuming as well, but if this is really the case, you could have much better performance up top and in turbulence by finding enough prop to use maybe 60% of your battery.
That would mean either more diameter, more blade width or 3 or 4 blades.
Can you borrow a different charger for comparison purposes?
Dean