I made a complete backup
went through Application Manager and wrote down all my apps
upgraded to new OS
restored the backup
went through application manager and selected them one by one.

didn't take too long. All (most?) of your settings are saved in the backup/restore