Finally gave in, starting to use layer comps in photoshop. #doublefacepalm