Fixed my account problem; all I had to do, it seems, was switch to a local account and then back to a Microsoft account and it gave me the prompt for my email address.

Of course now I can't use Smartglass or the Xbox tile at all, but moving that to my everything else account is much easier than the other way around.