If I were to do it over, I would take a very long look at the Tamron 60mm f/2 lens. I've never used it, but have heard really good things about it. I like the fact that it goes to f/2 which could be useful for better subject isolation if one really wanted to use the lens as double duty, macro and portrait.
I had the Tamron 60mm f/2 Macro. I'm not much of a Macro shooter, so I didn't use it much and the pictures might be great, but the focus is unbearably slow and awful. Sold that lens. Biggest loss I've ever taken on a lens, so you can probably get it cheap used.
When I went to FF, the only crop lens I kept was the 15-85mm in case I ever got another crop camera (which I did with the 7D II).