Have you tried loosening the high-limit screw slightly? Perhaps it needs to overshoot the big ring a little to shift, and you're preventing it from moving far enough with the stop. I'd probably let it out until it overshoots and throws the chain off to the outside, then try to bring it back in until everything works.