Oh I was totally about to suggest all that, actually...

Thanks for posting your response from Microsoft - please do let us know if it ends up working for you! Good luck...

Cheers,

Walker
Windows Outreach Team