New one is better than the old one but still not 100% fair.

Whatever the quality it is unfair for a team to play against a team of higher level.
The reason is simple: he can boost up his quality with half of resources than you. End of story.

Draw should be from same level with a mix up of teams, some could be better some could be worse.
And in order to make the competition hard as they want to be teams could have a +-10% difference average quality. All of them.

So we are talking of a real battle no matter what is your quality.

If the server has not enough teams to do that, it is not manager's fault that he owns a very good quality team.