OK! Using webform + webform_civicrm after all