Wow, this couldn't have worked out any better. Just got off the phone with United and they rebooked us on UA838 the whole way from TPE-SFO *and* they transfered our upgrade from the 852 flight and applied it to both legs. I now have a shorter layover and get to fly C the whole way, thank you flyertalk for the heads up!