There is also Option 3, which would be a modified Option 2, but the Teams could actually affect matchups to a degree. I believe you did matchups by hand last year, but if you use matchup software (or get me to do so), you can tell it to not match people up against teammates except as a last resort. This would make for a less competitive tournament as matchups would sometimes be a little messy if multiple teammates were close in rankings, but it would save folks coming from out of town *cough cough* from having to fight the folks they play on a regular basis and encourage a bit more of a mixup in matchups in that regard. You could probably also do this by hand, but it would be a little trickier maybe (or maybe not).