I think appbrain is the route I'm going to go to restore my apps. Sync your apps through appbrain, then after you update your phone to 2.2 go back to the market, install appbrain, sign in under your gmail account and they should all be listed there waiting to be downloaded. When you click on an app in appbrain it actually takes you to market.
Question for you, I use swype, will this be on my sd card to restore or will it be lost? I can't live without swype.
I see now, swype is on my sdcard. Hopefully it installs ok.