Don't hold your breathe on that one.
My brother went into an Apple Store to complain about the atrocious performance after upgrading to iOS 4. He contested that it is essentially malware, and that they must restore it to 3.1.3 for him. Clearly they cannot do that, and so they just gave him a new 3g (refurb) with 3.1.3 on it.