That should be find to amend for. I don't think either of those credits involve irrevocable elections or different statutes of limitations than the whole return or any requirement to use up AOTC consecutively.

I would however, amend PY asap, extend CY and wait until fall to file CY just to reduce the risk of an automated notice from ships passing in the night. If the amended return still isn't processed by then, I'd maybe even add an 8275 disclosure form in CY to call attention to it so that if a notice would be auto-generated, an agent looking at the 8275 might see it and be able to override it.