I'm in the same boat as you. I think whatever method they used to force the system to accept my 2g IMEI is stuck. I keep getting texts saying they've added the appropriate plan, but when I look it is still on the 2g unlimited plan. On the up side, 3G and mms are working fine even tho I'm still on the $20 edge plan. I doubt it will last...
Ya I kept getting texts that the data plan had adjusted. I checked and it was still the 2G plan. I chatted with a att tech online and he changed me over to $30 unlimited iPhone plan.