I'd have wound up screwed, regardless—as I upgraded to a new machine months after the Catalina "upgrade" on my old machine.
This will wind up being my last go-around with Apple. The lack of innovation and lack of respect to loyalists—I'm over it. They care more about pushing their subscription-based Apple Music on newer users, than taking care of the old iTunes crowd (and those who still have their own music and don't stream)—as if there isn't a way to cater to both.
I wound up taking a month to re-catalog all my music, so I no longer run an Apple Music / iTunes hybrid. Exported a thousand playlists to .txt files–reimporting them in to Apple Music one-by-one (thanks for that lack of a batching option, Apple. Super-appreciated.)
All my music is now in Music, all playlists imported, all cover art in place—which will be fine, until Apple finds a new way to screw things up for us. Hacks.