I think you just need two workflows for the original question. It sounds that way to me