Agree about taking NR Down.
However, I think that having NR as a Tournament was where the major mistake was.
Instead, I would like to see how a serial series of matches would work. i.e. you have 2 matches between a NR and a ranked opponent and if at least one NR wins, they meet in a championship round. If neither NR wins, two more NRs are chosen. If you keep winning, you keep playing (like a game show; until you win 4-in-a-row: if you're ranked, you're done. If you're NR, you get to fight 2 ranked and 2 NR in the next class for a possible promotion.) Of course, in order to "win", a NR not only has to win votes, but the totals have to exceed a minimum.
(Of course, if we change the promotion board to 2 Ranked in the NR's present class and 2 ranked in the next class, then it could make for good Bonus Match material. "How will <NR> Fare?")
I'll have to see if I have the time in the coming term. Worst comes to worse, I may do something in May.