Interesting find with the upgrade option.
Looks like I should just be able to punch in my "upgrade" serial (MS supposedly mailed it today) into my MSDN RTM copy...which is pretty sweet. I was fully prepared to have to treat it like Vista and install the upgrade on top of an existing working copy.
Yeah, its awesome. Let us know how it works out in your case.