Use the upgrade full, make a backup first, disable ALL addons, run the update, then update addons one at a time... dont re-enable old addons. As you upgrade them they will enable themselves. make backups along this process. depending on the numbver of addons you ahve in case something breaks you wont lose a bunch of work.
This advise comes from my trial and errors.