Use group_instances_with_overrides for current state

Ensure group_instance persists the effective gear size and addtl_fs_gb
values.