If you have not solved the problem yet, I'd suggest you use the stab as a reference, set the lower wing to the same as the stab and then set the upper wing at -1.5 degrees with respect to the stab. You will need about 1.5 to 3 degrees downthrust and 1.5 to 3 degrees right thrust. make all incidence measurements relative to the stabilizer.