I think the way to tackle it best is to "turn" the old contractor% into a storyline% because storyline contains all the heists (except events and some of the heist that exist multiple times with other loot, e.g. Bank Heist, Transport Heist), that's just my opinion though.