I currently have an iPhone 3GS and will be upgrading to an iPhone 4. Is it better to restore from backup or add as new phone? If adding from new phone, how would I keep my notes (probably about the only thing that isn't on a server...). I know I can reload my apps, but the data from the notes app is something I don't want to loose.