You are blessed to have clients so much patients... You allow yourself to keep a machine in the workshop a block on the ecu for a week...

I don't have degrees, work a whole life in the workshop and I know that to solve a problem the fastest way is the best.

On edc 16 , as this is much easier to intervene than in the other, a view of the port Bdm and ta relative ease of connection.

I in this case, I would try a Bdm backup, and in the worst case I would have gone into demolition and I would have taken another ecu that is compatible to riverginare and recovered the backup to fix the other.