I would suggest finding a good file comparison program. On Ubuntu Linux, I use Meld. I can load up my current configuration.h, and a new version from freshly-downloaded firmware, and see them side-by-side with the differences highlighted. Then it's just a matter of moving my settings from one to the other. It makes upgrading very fast and easy, especially since I have several mods of my own that need to be moved as well.