Excellent report! I've been in the same situation ... I was upgraded, the wife and child were not (I, too, have seen the face of doom on my loving wife when I told her the news). Since mine was a domestic flight, I just asked the guy next to my wife if he'd mind switching to C. After he fainted and then woke up, he was pleased to take my seat. My wife was very happy.

In your case, I think you did the best you could. Sounds like you had an awesome crew, which makes all the difference. If it were me, I would've gotten drunk on free booze in C and then seen what my wife would have done to me. But I've got a bit of a death wish.