I'm in exactly the same situation with a Blackberry Curve. I spoke to an ATT rep who said that when I get the phone I should call them before I do anything and give them the IMEI number off of the new iPhone and then they will set that up on the line that you are actually going to use. Then you can go ahead and activate through iTunes on the right number.
ok awesome. thank you for answering me!