If I understood you correctly what you meant, then yes, you need to create the required number of combinations of variants for all your cases.
By the way, you can also assemble such a construct with a boolean component property, and everything will work as expected:
