I've got a similar situation right now, Roger, with a new site launch that went technically wrong for more than a week. In the past, after a number of weeks, I'd only see the wrong URLs with a site: operator and never in an ordinary SERP. I'll see if that still holds, because I'm deep into a parallel situation right now.
The most critical thing is to remove ALL occurrences of the wrong URLs in the site. I would definitely not intentionally link to a URL that will redirect. That only compounds the chaos.