I'd opt for the trews if there is enough yardage. Otherwise I'd go for two waistcoats: one scoop neck for wear with a doublet or coatee, the other a standard six button for day wear or wear with an argyll jacket. And I'd definately have the tartan matched on the bias!