But if you just enter calibration mode and exit it again without actually calibrating (holding down Y), you will just update your altitude information.
The key is to adjust your speed to match the calibrated, not the other way around. fly at a speed 10-20 mph below your top speed. do the calibration and then adjust your speed to match the calibrated speed. That way you only need to do one calibration and you will do the fine tuning with your throttle instead.