Argh, I thought I had solved it - only to discover that I forgot about the breadcrumbs. They all have an extra level (the category level) in their path. And to make things worse, it is clickable!
Ok, solved the breadcrumbs issue as well by explicitely putting the ids of the container pages into the &ignoreIds parameter of the YAMSified breadcrumbs I’m using. Not very elegant as you have to manage this list by hand everytime the container setup changes, but then again this shouldn’t be too often.
Maybe one of your wizzards knows how to automate this (perhaps with PHx?) and check for the link attribute to contain the rel="category" marker that is used by wayfinder.