Upgrading and creating entity references
If you attempting a Drupal 6 to Drupal 7 update without migration, you want to keep the structures as simple as possible since minimizing rough edges. Therefore, I would wait until after the update. 

Once the site is upgraded, I would update the content types involved, and then write a simple custom module that creates a batch job for the conversion.