If you are going to do a restore, you should make yourself a blade safety jig. It helps so much. The link is to Bill Ellis' blog on how to make one.

Sounds like you have the right approach,...