I looked into this a little more - and I'm slightly optimistic that we may be able to solve this ourselves without having users worry about it. I've opened https://github.com/pulumi/pulumi-terraform/issues/266 to track what might be a fix for this. At the very least, it looks like it could solve the specific case you ran into, as well as a similar case in https://github.com/pulumi/pulumi-gcp/issues/48.