Anyone having problems with iPhoto to Photos migration with smart albums?

I

iMore Question

I just upgraded from iPhoto to Photos. Turns out my albums are a huge mess. I have a lot of smart albums based on Events. Photos just modified all these albums and really messed it up. Apparently Apple didn't prepare for this now that Events are no longer. Anyone else have this problem? Seems like I have to go back into iPhoto and make new -nonSmart- albums and migrate to Photo's again. Or does anyone have a better/quicker suggestion to fix this?