I would wear thin socks so that the overall thickness of your socks doesn't change from configuration to configuration.

To be clear, I think the advice is (others can clarify) to wear waterproof socks when it is cold AND wet (not OR). If it is warm and wet you'll sweat so much in waterproof socks that your feet will be wet either way.