Lubos provided a solution to this in another thread.
I did this yesterday and it works. You need to copy your drop down list before you change it to a single line text or it vanishes, do the upgrade, go into the new custom fields and change it to a drop-down list again and paste your list back in. It’s a bit of fiddling around but I only had a handful to upgrade and it didn’t take very long.