I have an iPhone 4 right now, and I'm a bit disappointed that the iPhone 4S isn't what i hoped it would be, after reading the rumors and having waited an extra 4/5 months. So should I upgrade my iPhone for a slightly better one, or get an iPad 2 now, and then an iPad 3 which is coming out soon...