The thing is, you are basically running stock recovery with no backups whatsoever. I'm sure you could do a factory reset but I have 0 experience with that. MY opinion (and it could be wrong) would be to get yourself a factory backup from droidforums.net, mount your phone, download the backup to the SD card, reboot into recovery and install that.
In essenence, lesson learned, make backups from now on. Start over, make your phone how you want it and call it a day.
I used RSD Lite to get root access. ALong with SP Recovery.
You are going through the process to unroot the phone, that's different. Follow those instructions to get your phone back to the day you bought it which is what you are after.
I'm pretty sure if you followed those directions you would be at 2.1. I would aslo imagine you would have a choice based on what you download which one you want to go back to. Be it 2.0 or 2.1