For the moment, I have ditched the tea tray and opted for the "plates and bowls" setup. It's a little simpler and easier to clean.
I like tea trays with basins because you can get messy and think about it later, but the trays get dirty/grimy if you don't clean them constantly. The wood ones also tend to split and break because of the expansion and contraction caused by water. With this setup, the waste water bowl is emptied as soon as it gets full. If the bowl becomes dirty, it's easy to wipe out.