Sole Source IDIQ and utilizing contractor to perform work that Government Agency normally performs (Best Way to Structure CLINs)

[Jbert]

I work a sole source IDIQ.  A government entity flies out to the contractor's facility (GOCO) and perform upgrades on (GFP) equipment, software, etc as required for the requirement associated with the IDIQ.   Since COVID, this has become more difficult with travel restrictions, people coming into contact with those infected, etc.  The government entity responsible for performing upgrades, replacing equipment, etc. is seeking to now have the contractor perform the work.  The contractor is capable of performing the work and has no objections to it. The government entity would MIPR us the funds and we'd cut an order off of our IDIQ.  The IDIQ allows for pretty much any contract type to be utilized.   Instead of having to go through the whole process each time a new requirement arises as it relates to equipment needing a software upgrade, replaced, etc., my initial thought is to create a T&M type of CLIN and utilize it with a PoP of 1 year.  Are there other methods that you has contracting professionals would suggest, or have had success with in the past?