If the extra work is a 1 time thing and won't increase the cost of the maintenance, I vote for the unichart. If the additional work has to be done on every chart release and can't be automated, the current method is fine.
Note: If you go the way of the unichart, a control that gives quick access to map key (legend) would be nice.