Yeap. Sounds like a plan to me.

You may want to mark the case heads with a Sharpie or do something so you'll know which cases are the ones you have annealed and bumped back.