haha - Maybe. You won't know until you have tried. If it doesn't work with 2.1, it will be the first time it hasn't worked. I've done it a number of times before.
I'd say back up the settings and try it. If it fails, THEN do the clean install and restore.
If you want to go straight to clean install and restore, thats always good.