If they are telling you May2022, I would consider delaying it a further 2 months and going for a MY23 build.