I’ve been working on exactly this issue. If you have a chance to give the beta for 1.17 a try (you can find it here: Interstitial Firmware Releases - #633 by bar) I would love feedback.
What that change does is rank all of the measurements and throws out the worst ones which prevents bad measurements from either throwing off the calibration results or making the calibration fail.