Hello Paul
I had the same problem recently.
What you definitely need to do is resetting the existing Cal values in the memory before saving new data there.
In my -Q SW Version I even had to Reset the value and press SAVE to the intended Cal Location. Only with SAVE it got truly erased
After the next Calibration everything worked fine.