Auto-translated
I would suggest playing up to 3 wins. 4 single matches and one doubles match, like in tennis. First, the players play two singles, then a doubles, then two more singles.
Secondly, the team play factor is very low here; you can win the team match and lose all the singles.