Welp, I have to eat humble pie. Since my iPhone 3gs was under warranty, Apple simply replaced my unit with one that runs 3.13 software rather than the 4.0. Really cool. NEW iPhone too. So I have to say, they were very cool to deal with it.
And now it makes me want to buy the iPhone 4.