It's completely up to you Lyman. But I think what you plan sounds good.
My whole thing with this is I think we need SOME definition of what is allowed when the measured distance is greater than the advertised distance. Something like "full disclosure" that Guido and Bob suggest, and you implemented, would be fine with me.