Glad you got this worked out. For others that are looking for something similar. You can’t depend on the existence or absence of data in conditional fields. ACF does not remove data from the database when a field is hidden by conditional logic and like the OP says, you need to base your display of the values on the same field that the conditional logic uses.
