You seem to be basically on the right track, but the idea is to find the stall point and back off of that significantly, by 25% or so, to give yourself a safety margin. If 20% gives you good performance without lost steps that's great, but if not, cut that to 10% of velocity and try that.