Upgrade to Drupal 8 or wait for Drupal 9?