Two suggestions for the 35mm macro! I already have the tamron 90mm f2.5 and the Pentax F 50mm f2.8, I think I have the macro side of my lenses covered
I do agree the 40mm M lens is more a novelty than anything else - I don't mind the stop down metering or the size, but I just don't use it often.
I realize the sigma lenses are larger, but I don't mind a little weight in the bag, so I think one would be alright. I was planning on taking the 18-55 WR just in case of inclement weather. The more I think about it I think I am just going to get the 30mm - looking at samples from it on pbase I keep being impressed (I am also not totally sold on the bokeh coming from the 21mm - subjective I know, but its not striking...not that you would generally use that for out-of-focus shots).
I think the 15-30-50 along with the 18-55 and perhaps the 10-17mm fisheye will be a relatively small travel kit. Anyone thing that would be too much? Any reason I should take my 50mm macro instead of the 50mm AF F1.7?