I'd say you did it as right as could be expected.

The creek was a suprise, you came out all right from it. Lessons learned- plan for water when packing, and wool is good.

Your choice to attempt a self rescue wasn't a bad one. I'd have tried it to. The question you need to realistically ask is, if the second attempt had failed, would you have made a third, or dug in?

You had going for you was your company. Good morale, always needed. And you didn't panic.