Best way to match Scenario with the corresponding Year members in Management Reporting?

First, our situation:

We have a Scenario dimension containing members such as:

FY23 Budget (Budget created in FY23, for the years FY23 and FY24)

FY23 Forecast 2 (Forecast created in FY23, for the year FY23 only)

FY23 Strategic Plan (Strat Plan created in FY23, for the years FY23,FY24,FY25,FY26,FY27)

Throughout the application, in our forms, we have used substitution variables to match Scenarios with their years correctly. This is standard practise of course, and works perfectly well since you're only working on a current plan.

However, when we make it to Management Reporting, a user will typically want to run reports for historical plans as well.