Thinking out loud here.

Maybe build in a little to much AOA. You can always shim the TE of the wing to reduce the AOA for testing purposes. Once you have it where you want it you can go back and "repair" the wing saddle to fill the gap between the wing and the fuse.

Ken