He had expected that Hans would give him trouble: what he had not expected was that the trouble would have a strong element of personal feeling. 
He had expected that Hans would give him trouble: what he had not expected was that the trouble would make him feel so strongly. 