I like Vince’s site, and find his insights into Campbell Canntaireachd fruitful for discussion.
I personally believe that one way to rehabilitate these tunes in competition might be to pick up on one of Barnaby’s idea: to create a format different than the “single-tune” requirement. Perhaps to require a “small” and “large” pibroch. Perhaps to give the performer a set length of time to fill and require no less than two tunes to fill it. Regardless: brainstorming options other than the current format could prove to be fruitful.