goodroi - 10:00 pm on Dec 20, 2011 (gmt 0)
I personally have not handled OOP the way you have mentioned. I typically look at the areas that have been overworked and then add more variety to bring it back to where I like it to be.
If you have properly setup the 301 redirects and Google is already following them, then IMHO there is not a big reason to use "change of address". Is your new site ranking?