Mm... Both. I also stayed with Society on the condition the organization backed off. I continued to assist and travel with Gran when I didn't have any missions.

[He leans back a little against his pillow as he considers how his life has changed like that.]

They are no longer in danger from them, outside of any rogue factions that may have other ideas. But that is another reason why I stay with the organization—to keep tabs on what's going on and intervene if necessary.