For whatever it might be worth, here's Iarla Ó Lionárd singing a live version of Aobhínn Crónán, that I like.

I have no Irish, but the words he is singing do seem to match those sung by Cór Cúil Aodha, and they both seem to slightly differ from the poem posted above. Am I imagining this difference, or is it just the way Irish is pronounced? Or could the words have been changed slightly to fit Ó Riada's tune?

And thanks much to keberoxu for the diligence in finding the poem in the first place.