What about finding Klaus and sleeping with Alwyth in China? Done both? One or the other?
Yes
I'd need your save file to check properly I'm afraid. Seems like something's gone wrong along the way.