Agreed, these type of analyses benefit from grouping by cohort years. Standard practice in analytics.