I think it may be too late to do a simple flag day and fix things.
http://www.unicode.org/review/pr-29.html
I believe it would be useful to start thinking of the problem in terms of a transition plan from what we have today and what we would like to have tomorrow. It is not clear to me exactly what we would like to have tomorrow, so settling that would have to be part of the plan as well.
http://www.unicode.org/reports/tr15/tr15-24.html
http://www.unicode.org/Public/UNIDATA/NormalizationCorrections.txt
(Whether we would want to do this is a separate question.)
Erik