Curricula Activity- show expiration date correctly on reports

Our MSHA Curriculum has to be set by a certain way according to guidelines.

The course:

1. Curriculum: MSHA Part 46 New Miner Training

Availability:

1. Expiration: Time from enrollment is set at 90 days.

2. Due date from time of enrollment is 45 days.

Competion:

1. Expiry 1year from time of completion.

The reports i pull to show managers and safety to see who is expiring is confusing. It is showing the "Avaiability" expiry after completion and not the certificates "completion"

Need a report that will show the course completion and the "Completion expiry". That we know if the certs are expiring soon and need a refresher course.