I'm leaving it for now. Eventually we are breaking AD sync and I set it up that way so even when we break AD sync and clients will go to the Default Group, they will still check in to their respective GUP. Then I can configure so there are only 3 locations (On network, Off network, and GUP)
Either way, when breaking inheritance on many groups, policy administration is rough.
And I could live with for the most part except when dealing with the Settings area under the Policies tab. if you break inheritance on multiple groups and decide later you want to change the heartbeat, you have to do it for each individual group...it needs to be similar to the actual policies settings where you can change one policy but the others don't change, even though inheritance is unchecked.