I’ve been dramatically reorganizing my library to find a way that matches both my use of Virtual DJ and Engine DJ. Described here ==>
Yet, this work is not over
So I’m not 100% sure that my problems are behind me. Yet you should have a look to check if your issue has the same origin than mine.