Just a thought on what l have posted in the past, it is the component management part of the companies technical records department that should spot this problem.
When they update the components records during or after the change, they should spot it has not been overhauled and arrange for said component to be removed and replaced with an overhauled unit.
If needed apply for a variation to the AMP task requirement and if it is already overdue report it to their local authority like good little boys.