Icebreaker Merino wool underwear, and shorts. Through in a Brooks saddle and that is my plan for my next trip (which will be long). I don't really believe that padded shorts do a whole lot, even before my brooks saddle, I only wore padded short every two or three days.
Merino Wool Underwear is amazing (I cannot stress this fact enough, Merino wool shirt and sweaters are amazing too).