For some reason AppBrain wasn't restoring my apps...I don't know why not. But luckily I had backed them up using ASTRO too. That restored them no problem.
Also made sure to backup my contacts using the built in backup thingy.
Used Launcher Pro to backup my layout, so that was easy to get back. Just had to replace the widgets. no prob.
I thought that it would wipe the internal storage though, so I backed up my pics, videos, music....It was all still there when I finished!
The only part that I had to restore was my settings, apps, contacts. All in all, it was a pretty pain free process. I can't believe how many people are complaining about not having 2.2 OTA sent to them, when they can just follow these easy steps and get it!