Systems Management

We are planning on rolling out Office 2007 Standard and Professional soon by department (finance, HR, IT, etc). We have over 50 SMS sites and users in the groups could be anywhere. I want to use AD group membership to determine when that group will be Office 2007. That's easy, what's not is determining was group the user is in and whether the user should get Standard or Professional. I have tried by creating a collection called "Office 2007 upgade" with 2 sub-collections called "Standard" and "Pro". "Office 2007 upgrade" membership is based on AD group membership and I have "Standard" and "Pro" limit their search to just "Office 2007 Upgrade". They then look whether Office Pro or Standard is installed with a query. The problem is one query is a system resource and the other is a user and I can't seem to tie them together. I figure I can't be the only one to try this.

Any ideas?
Thanks for the help in advance.