I have run into this problem before, and the only workaround that I found was to surface the two fields when filling out the form, but then use a calculated field with if statements to use the secondary field selection, so you can say if({field A} = {Option 1}, {field 1}, if({field A} = {Option 2}, ...