Hi @gallahad11
I’ve just checked the documentation about workflows, and I found this workaround:
In a workflow with two actions, if Step 2 is using a condition based on a search depending on data manipulated in Step 1, then Step 1 should be implemented into a custom event to make sure it is finished before moving on to Step 2.
This way you’re sure the changes have made before used them in a custom state.
That means solution 2 from @aschofer is right 
Hope this helps