I was thinking about getting the 40mm 2.8 or the 85mm 3.5 along with a 35mm 1.8.
Now I might go with the tamron 180 along with the 35mm 1.8
you can always do a 35/1.8 and a 60/2 or 90/2.8mm tamron. which is more or less the same size as the 85/3.5.
what are you planning to shoot with the macro?