Going back to 3.1.3 and restoring was quick and fairly painless when I did it. At least that way Apple might fix something in the future that lets you upgrade.

You can always choose to take the painful route later if you need to.
_________________________
Remind me to change my signature to something more interesting someday