This is exactly a great case for Auto-Layout and one that we thought about using.

We learned that our designers find it more efficient to swap to different options than actually going into the component and turning off layers.

On one hand, easier maintenance on my side but more education to roll out for everyone else. And that's what I struggle with all the time; making my life easier or making the designer's life easier!

Believe me, I've thought this exact thing through. Glad that we're on the same page!