I wouldn't let AT&T know if I were you, let them change it automatically and then you can call them. The only problem is you may not be able to access apple apps if you don't have the apple data plan.
By the way, their system can and will automatically detect your phone. I purchased a used blackberry phone (from a private party) for my wife and son and when I checked my online AT&T account, the system showed the exact blackberry model they have. AT&T will also tell you that they will automatically add data plan to any smartphone but we've had the blackberry for over 6 months now and we are only paying for voice. I didn't add data to my number until I got my iPhone 4.