If you do as I suggested about random draws in odd numbered rounds from 3-15 with the order flipped in the even numbered rounds 4-16, the system becomes infinitely more fair and will go a LONG way in mitigating some of the discontent so far. The website you used before, it'll take just a few minutes. Think about it.
"And do not curse those who call on other than GOD, lest they blaspheme and curse GOD, out of ignorance. We have adorned the works of every group in their eyes. Ultimately, they return to their Lord, then He informs them of everything they had done." (Qur'an 6:108)