WP_Query: Posts within category OR custom post type

I really think that you have over complicated things here. Here is how I would treat the matter

  • First of all, create a custom post type (which you have already done)

  • Assign a custom taxonomy to it

  • Convert all the posts from the listas-2 category to your created custom post type. See this post on how to

  • Re-assign your custom taxonomy to these converted posts