Ah well, maybe not quite fixed then.
Appeared to be OK but with 18,000+ tracks it could create a database but no playlists and then gave me a memory error.

I'm taking some tracks off and see if it can survive OK on less tracks. A bit annoying when I have the 2x 256GB disks and can get less than 130GB on the machine...