I don't know about your exact numbers because as someone else said before those are sensitive to the parameteres you use to estimate future difficulty.
Your logic though is correct.