Perhaps the upgrade might be failing due to a data type conflict re: the previous data in those columns.
What if you do this?:
1. Remove all promoted properties
2. Publish the form (check if the columns are gone?)
3. Re-add the promoted properties
4. Republish the form. (does that add the columns with the correct data type?)