The BEST way for doing this is to do everything in Git. You take a fresh version of your board to init your master branch on. Then create a branch "modded", copy over your modded board files and commit that. So at this point you have all your changes in your branch. Upgrades are done on the master branch and then you merge your "modded" branch. This removes most of the work rebuilding your modifications during upgrades.
