The solution is very easy.
In Week 1 instead of 1st v 4th & 2nd v 3rd you have 1st v 3rd & 2nd v 4th (doesn't matter what you do in the bottom half, but you can change as well).
This means that for the following two rounds highest always plays lowest with the highest at home in Week 2 (as now) and in Week 3 the two teams through get home a home draw and again highest always plays lowest. This means it is impossible for the same fixtures we had in Week 1 to be the same Week 3... like we are likely to get this time!
Voilà, no club call, no crap, just a straight forward system!