Failback model matching (match on WTC + Parameters) appears to be failing

In testing with the fixed model matching code in XSB, I'm still getting situations where there's no viable models, and then we're completely falling through the fallback match using engine and wake turbulence parameters.

Mostly visible with GA craft.