Your original sentences were fine, but because you were using the past perfect tense for two of your sentences, it makes more sense to use it for all three, because all three sentences refer to the same point in time. Your original wording makes it seem like "He was surprised for a long time", and the new wording makes it seem like "He was surprised when she called, and then stopped being surprised. " It's a very very small difference, and most people wouldn't correct it. (Your original sentences aren't wrong, I'm just giving a different perspective.)