Definitely sona - second element would be declined as "bolg" is in Modern Irish. Terrible to think the word is masculine - given the very recent sexism and genderism applied to the celebration of this saint or goddess.