I think you should start doing all official tournaments with 7 rounds and not with 5 because it’s too short. Also change the tiebreak system the first tiebreak has to be the result of their individual game.
Best regards,