Separate settings for containers and categories

I would like to be able to set a view for a container and disable the node listing for categories. At this time the category_display module allows you to disable the node listing but then it will be disabled for both containers and categories. Just like #275176: Allow two views, one for container page and another for category pages does for views I would like separate listing settings for containers and categories.

Also, these different modules interact on so many levels which results in hard to understand functions like function category_node_listing($node). I'm thinking it might be a good idea to merge the category_views and category_display modules.