Just changed my ticket to avoid PVG all together. Now it's ORD-NRT-BKK, saver award in F. No more worries about having to collect and re-check bags! No worries about having proof of my onward ticket out of PVG within hours...

Now, if I can just get my husband's ticket changed too!! He will join me in Bangkok about 5 days later. His flight date is not showing anything available in F (saver) just yet. I'll keep watching though. I know that availability will often pop up within a couple of days of flying.