Thanks for that Mathieu, we switched to your second suggestion and simply set the required Samsung apps to auto install once we removed the whitelisting and app control profile.
Would there be any long term implications to not having the application control profile? We have a COBU environment with Samsung, some COPE in the future.
As far as I can see, the application control and whitelisting is not really necessary anymore, as we have systems apps only enabled on enrolment and most Samsung apps can now be found on the Play Store.
Nick