Sorry for the delay....
My original fare was in G. I paid the 20k and $75 when it was offered (immediately after booking) for the SFO - HND leg.
I got a complimentary upgrade on the PVG - SFO leg
With that, UA was not happy with me trying to do the TWOV by going SFO-HND-PVG-SFO and they weren't going to let me fly. I had to add another flight showing them I was only in transit through PVG so I now have another (refunadable) flight going to ICN. For whatever reason they did not think I was allowed the TWOV since my itinerary started and ended in the US.
Anyone else have any issues - I'm currently flying on this mileage run and will see how it goes.