Ah sorry, I missed that there were calculated fields, here's what I would do.
1. Create new form with all fields, except without calculated fields that overlap
2. Apply new form to projects that have old form
3. Remove old form from projects
4. Add calculated fields to new form, and trigger recalcul...