The upgrade itself is easier now then ever...With one click everything will rebuild for you. Just upload the new cgi-bin, non-cgi, Templates and images files. You will need some Vars files such as (vars_ci.cgi). Whatever you do, DO NOT replace any vars files or Members and Forum directories. If you do all of your settings, memberlist and forums will no longer exist.
Unfortunately you're hacks will go along with an upgrade.