You should list your priorities. I'd say for macro or portraiture any cent spent on the body is wasted since you have not spend it on a better lense. Even if you say, you have not made a big investment into the lenses, I would be very careful to change the manufacturer, because you will not only have to buy new lenses, but have to change to a new user interface. I'd even go so far as to say that you will not gain from switching the manufacturer, since the features of the semi-pros from every manufacturer will be so close as not make a difference for the average amateur.

You should list your priorities. I'd say for macro or portraiture any cent spent on the body is wasted since you have not spent it on a better lense. Even if you say, you have not made a big investment into the lenses, I would be very careful to change the manufacturer, because you will not only have to buy new lenses, but have to change to a new user interface. I'd even go so far as to say that you will not gain from switching the manufacturer, since the features of the semi-pros from every manufacturer will be so close that it doesn't make a difference for the average amateur.