Only counting charmed pieces on checkmates and charm quotas could be a good idea. It would also make the final victory feel more earned since it can currently appear on a map where you got beaten quite badly.
