Post types – duplicates

Hey. I am running a site using one custom post type and the standard post type.

[Code moderated as per the Forum Rules. Please use the pastebin]

My permalin structure is only the postname. If I create an article called “hell world” and a second one called “hello world” the slugs would be automatically “hello-world” and “hello-world-2”, which is great. But if I create a post by custom post type and name it “hello world” too, then the slug will be “hello-world”, so I got a duplicate slug which causes trouble. Because my permalinks ar only postnames.

So the problem is, if I have two posts with the same name but with different post types, I get wrong results on single pages.

Any ideas how to solve this problem?

Thanks a lot!