Extend template conditions so you can combine several dynamic fields with AND/OR and explicit grouping, for example (A AND B) OR C.
Conditions could also compare one dynamic field with another instead of only fixed values, so you can build complex templates without duplicated sections or helper fields.