back to stock 2.1 from froyo rom

Download Rom Manager (free version works) from the market and go to Download Rom and go to Stock Images. There's an unrooted 2.0.1 there and you can probably just do the OTA update to 2.1