I'm in same situation. I pre-ordered from Amazon. I didn't get a second code. Are you sure that the Amazon code can be used for both? When I tried it says my code has already been entered.

I don't get prompted for the 3.0 update, and only receive a 4.3 gb update.