After dealing with the same crap you have been dealing with, I've made the decision to not take my Nokia's on my trips with me -- not since my N95-3 has one been 100% reliable.
I'm going to Boston this weekend, and while I already feel guilty/embarrassed that I will be taking an iPhone 4, I...