Hi there, @steven13… just FYI, but what you described (using two workflow events with conditions at the event level) is essentially the best practice on this one given the way workflows and actions within them operate. So, in other words, well done figuring this one out, and you should be good to go here.
Best…
Mike