I agree with your suggestion that Individual Opifex and Team Opifex ought to be two different entities. The reason for this is that, despite the request for Dev Team leaders to make the judgement call on who should be nominated, modders who have made far less contributions than others will be nominated to some extent on the coat tails of other team members. That's just a fact.
So it would be far better to have a badge that reflected that the person's involvement in the Team was being rewarded rather than an individual award being applied to such divergent levels of commitment and skill (and thus contribution to the TW community as a whole).
Ideally the whole thing should be disassociated from rank anyway - the awards are a much better way to go imho.
An award can be given to anyone or any team deemed worthy but I am not sure what rank means - is it about the wider community of TW players and modders or is it just about TWC itself? The greatest contributor in the modding community may not even be a citizen of TWC...
But as you may know, my feelings on patronage and the nature of the rank philosophy are that the first should be done away with and the second founded more upon merit.
But these last points aside, I think the differentiation you suggest would be a step in the right direction