Producing forms for private clients is something I do a lot. Content controls are the way forward here. In addition to their flexibility, they are much faster to process to extract data than legacy form fields.
I have tools available on my web site which will make this task much easier e.g. for insertion of controls
https://www.gmayor.com/insert_content_control_addin.htm
For data extraction from controls
https://www.gmayor.com/ExtractDataFromForms.htm
The latter also includes a utility to convert form fields to content controls.