To add to what you suggest: I make a habit of verifying and writing the breaker number on the back side of the faceplate each time I have to remove/replace one.
Always re-check before digging into the wiring obviously, but man I don't know how many trips up and down the basement stairs that has saved me over the years!
