Always comment hacks, and make sure to keep a hack list. Two simple rules that keep upgrading simple. Also since they are releasing a list with all the files changed, all that's needed is to upload a few files and upgrade14 in my sitaution and boom done. The nall I have to do is go through my hack list and re-edit the few files that have changed... Not to difficult.
my .02
plus look, this forum is now running 2.2.1.....