That's exactly what I ended up doing. I flashed back to stock with Odin, updated and then spent the next 6 hours putting everything back the way I wanted it. Why? Well, because thought I had run Backup TouchWiz (which I found on XDA here:
[APP] BackupTouchWiz - xda-developers ) but apparently it didn't actually work. After re-rooting and reinstalling all the apps - which BTW was a breeze with Titanium Backup - I ran the "Restore" function of Backup TouchWiz and nothing happened. That's when I checked the actual backup files that it made and saw they were each 0 Kb in size.
No big deal though...phone is back up and all is well.