Splitting Irish into two subjects is the answer
Both junior certificate and leaving certificate syllabi fall between two stools: too easy for native/habitual speakers and too difficult for learners, especially at honours level.
A solution would be to create two subjects: Irish language (for language learners) and Irish literature (for native/habitual speakers).