Well, your last suggestion is one of the last "logical" counters I have not tried against this. As I need to take risks for the second leg, I will more likely use a modified 4-4-2 ND like 4-2DMC-1-2AMC-1 short/middle. Or modified 4-5-1V like 4-2DMC-1-2WAM-1 flanks/mixed.