We would not necessarily need to implement two rules. The rule for (2) would already include all cases of (1). All decomposable diacritics already have a corresponding name, e.g., "LATIN SMALL LETTER E WITH ACUTE", which is part of (1).
What do you know, our Chair is an actual genius. He just created the easiest UA implementation rule ever.
--
Mark W. Datysgeld
Director at Governance Primer [governanceprimer.com]
Project Lead Developer at ICANNWiki [icannwiki.org]