Change the sample tool to have an allow all records option. This will allow you to include the sample tool in a production workflow and will be a constant tool to allow you to debug the workflow if necessary. This will prevent you having to delete and re-add the sample tool everytime you need to use it. Could also have a workflow option of 'set samples to all records' which you could click on when publishing to Gallery.