Hi Mario,
I don't think there is an out of the box way to keep the agents in ACW until Salesforce signals completion.
You can use the following API to end ACW in Genesys: POST /api/v2/conversations/{convId}/participants/{partId}/communications/{commId}/wrapup and more information on setting the agents routing status can be found here: Set Routing Status
To keep AHT consistent across the two platforms, you would need them to match calculations the Genesys Cloud calculation is available here: average handle time (AHT)
It might be a good idea to ask this in the Genesys Cloud Developer Community as well as someone may have developed a solution already.
Hopefully others in this community may be able to help as well.
------------------------------
Sam Jillard
Online Community Manager/Moderator
Genesys - Employees
------------------------------