Heh, the AT&T SIM will not come within miles of my iPhone once I'm in Japan. Not even going to come close to making that mistake.
I could unlock it but I'm kinda hoping a new iPhone is out by then. Then I could just wait to upgrade until I'm in Japan and pick up the new one strait from the provider there.