Seems like a great plan to me. I would suggest that you resist the urge to use the Naniwa until the razor gets to the point where it doesn't get back to shave ready condition with the diamond spray and/or CrOx alone.

Also, I would ask Don or Lynn which stone they recommend to freshen up an edge. The Naniwa will work great, but they may have additional alternatives for you, like a Shapton 16K.

Good luck and have fun.