Workflow for creating / maintaining similar themes - best practice?

Not quite answering your question but might be useful Making a section optional (e.g. adsense or not)