Need advice with upgrade

[Jim]

I ran the samsung upgrade and then rooted. I was unable to get my titanium backup to restore all my settings. ARRRRGH.

My apps were not put back and even though they are listed in titanium backup, I have to reinstall each one from the market seperately.

Since I have to do all this manually anyway, would it be advisable to perform a complete factory reset and then install the upgrade fresh?

Other than being rooted, I don't really have use for a non-factory ROM.

What directions should I be following to get this puppy back up and running fast and reliable?