Form Promotion and Email Integration

We have started using form promotions to better standardize the development and testing of our forms. We also use the email integration to send completed form data to end users directly. We have an issue with the email integration and the field mappings that happen when using the form promotion. Each time we promote the form, we have to go into the email integration and update the template with the new form field IDs i.e. <<form_field_4>> → <<form_field_5>>.

Is there a way to have the field mapping update to also update the email integration?
If not, is there a way to turn off form promotion?