help me choose! (macro lens options)

So, I'm at a crossroads. I'd like a macro lens and a longer prime for portrait work. What would you go with?

60mm macro + 85mm 1.8

or

50mm 1.4 + or 100mm macro

I have the Sigma 30mm 1.4 now, so I was thinking of dropping the 50mm 1.4.

The easiest thing to do is just pick up the 100 macro since I already have the 50mm 1.4, but since I have the sigma 30mm, I don't see using the 50mm 1.4 much. What are your thoughts?

Look at the Tamron 90 f/2.8 Macro.
IQ, CA, just aa good as the Canon 100.

Gets great reviews.

I prefer the canon USM ultrasonic motor. Both have good optics.