I suggest creating an Academic Year field in the forms and linking it to the current academic year.

This would greatly support our workflow and can be automatically updated each year during the re-enrolment process.