Doubles - a double round robin with Bo3 final over 2 days. There will be 6 rounds on the first day (i.e. first full round robin plus first game of second round) so that on day two we can complete the remaining 4 block rounds and then have the Bo3 final (min 6 games, max 7 for the day).
No day will have more than 6 games in one day, except if the final goes to 3 games.

Singles - two blocks of 8 (with time for a play-off for any tied 4th place getters) followed by Bo3 XYZW knockout for top 4 from each block (and a similar Bo3 XYZW knockout for the bottom 4 of each block for the plate).
There will be 6 block games on day 1, the final block game on the morning of day 2, followed by any play-off games, then the Bo3 quarter finals on the afternoon of day 2, with Bo3 semi and Bo3 final on day 3.
No day will have more than 6 games in one day.