Hi @Melly2022! We are actually in the process of releasing an upgraded Workflows experience which would bring the “Go to action” to your contact workflows! While we won’t have “mini if/then branches”, it will allow you to reconnect branches. In the case described in bullet 1, you would be able to achieve it without duplicating logic by adding a Go to action from the “NO” branch back to the point you’d like to reconnect your workflow into on your “YES” branch.
You can read more about that and the rest of the features that are upcoming in this announcement: https://www.hubspot.com/product-updates/a-new-engine-for-your-workflows