I know the feeling. I have three hacks on my board alone. It really annoyed me when Infopop released 6.1, 22.214.171.124 and 126.96.36.199 so close to each other. Luckily I have BBedit so I could just do a simple document comparison and add the changes to the hacked files. Saves a great deal of time.
It's good that you're trying to keep the boards current, I just wish MacAddict would try to do the same. They still use bloody 5.47e.
That's the problem with changing the past. You never get to say "I told you so".