I find silk liner socks (REI) solve a lot of problems. They appear to be immune to smell, don't need washing very often and are great at preventing blisters (the reason I wear them). Make sweaty socks really easy to pull off. I simply wear them under whatever I would wear anyway. Wet or dry, they simply make my life better.
Ben