> i had to pull the state and change the provider field manually to avoid recreation of some resources.

Terraform CLI introduced an upgrade command (can't remember what it's called) that automatically does this for you.