combining 2 forms into 1 - conditional logic


I am trying to combine 2 forms into 1 super form (a business order form)

The logic is spot on for on 1 & 2 form but the combined form shows all of the fields in step 2 when it should be if a certain product is chosen then only show these fields. It looks like the logic is hierarchy from the combined form field "form" field.

How can i only show 1 product at a time when both forms are "combined"

I also want to keep the combined form to display this way when the form first loads. To show the form this way there is logic on this question.

I am hopeful someone has a work around. See attached video so you can see my logic.