If the problem is only tied to Switch Modules causing a GRE, could these Switch Modules be replaced with combinations of Selector and List Modules, which do not cause a GRE when another input is selected ?
Switch
Selector
List