Same here. Yeah, that's solid advice. One extra thing—sometimes just leaving it connected to the internet for a day or two lets it sort itself out automatically.
Can confirm. You could also try running the Activation troubleshooter again, but this time choose the "I changed hardware on this device recently" option. Let me know if that works.