The way I count is by the individual. So since every Targetmaster I know of has his/her own individual consciousness in the western canon I count them separate. So for example Ginrai is one character for the whole set, but Powermaster Optimus Prime counts as two because Hi-Q has his own mind.

I also keep track of a separate number of how many sets.