Or, see if you can factory reset and then root from 2.01 and then go to 2.2. This though is a pain and you'll likely have to redownload a lot from the market. There's a lot of instructions in the link I posted and also google it.
Portions of this page are modifications based on work created and shared by the Android Open Source Project
and used according to terms described in the Creative Commons 2.5 Attribution License. AndroidCentral is an independent site
that is not affiliated with or endorsed by Google.