ok,sorry for the delay. actually i have a new plan. i dunno if it will work,but its worth a shot and will save you from having to reflash the radios a couple more times.
-download the rooted OTA rom from here:
[ROM] Official 1.70.605.0 MR2 OTA Deodexed Rooted Busybox Mirrors Added - xda-developers it uses the radios youre allready running.
-boot into clockwork recovery. make a backup of cm7(assuming you got it reflashed and working correctly)
-now do a full wipe(data/cache/dalvik). flash the ota rom.
-boot it up,sign into your google account. get titanium backup from the market,and use it to restore everything,including system data. since this is another stock rom it may be close enuff for you to restore the system data without all the force closes you were getting on cm7. it should bring back all your contacts.
now is the part i cant figure out. i tried to figure out how to change a contact from phone to google on my stock incredible(sense 1.0,but i figured it wiuld be similar) and i have no idea. when i make a new contact,it asks you to pick unsynced phone,or synced google,but i cant figure out for nothing how to change it once its saved
some quick google searching seems to indicate it may not be possible
im not a sense rom that i can look at and try and figure out,at the moment. maybe the forum can help us here?
failing just eding the contact somehow,you could possibly just run backup assistant,or find an app in the market that would possibly sync them for you. this is an old thread,but it may help:
http://androidforums.com/eris-suppo...w-convert-phone-contacts-google-contacts.html
but anyway,once you figure out a way to sync your existing phone contacts with your google account,then all youll have to do is go to settings/accounts and sync anhd force google contacts to sync. once its done,go back to recovery,full wipe,then restore your cm7 backup. or reflash it.
now when you sync your contacts,they will automatically download from google,and it should work like i described in post 4 to get your pics to sync from facebook,etc.
just in the future,always make sure you pic "google" as the type when adding new contacts!
hope that help you some