I think it's in the ballpark....but I don't think it is quite there (especially since you changed threshold). I had forgotten about that set.....I might have to give that a whirl.
Check out the IG thread on things to look for to determine which way to adjust, if needed....you're probably at the point where 1 point adjustments are needed.