Also, as others have said, Downloading and installing the doctors would return everything to factory settings and may fix your problems. Doctors, to me, are a last ditch effort. In the end though, I don't see how an update to 2.x would do anything to your phone to fix your problems that a doctor wouldn't do. Your specific problems are not addressed in the 2.1 update.

EDIT: I say last ditch as they tend to delete text messages, phone history, web history, etc... A doctor will NOT delete apps you have downloaded and contacts.