My hack to get around this was to have the user an groupadmin but not necessarily a member of the group. Then that user could add and remove themselves from a group as required, keeping under the 16 limit.