I'd like to make a humble suggestion. Since team tourneys resolve faster than singles, have the singles for one game and the teams for the other on one day, then switch it for the next. That way, everyone's not stuck there til ungodly hours on singles' day.