I think holding off making any decisions until the new interface/functionality for videos are in place, like @taskmaster4450le suggests, is a good idea.

Going back and editing thousands of entries is not very tempting, at least not at this time, and I'll admit I've considered to just say that's that. Not very eager to add new music/videos with the new solution either, in case that suddenly stops working too.

I do have literally thousands of songs lined up for posting though