3/8" sounds like a lot of incidence change for a .40-size wing.

I agree that the best bet is to, as Dave Platt has said, "Just start in and do the job." It's worth the effort to fix the wing incidence, rather than get into what will probably be a losing battle with trim fixes.

That's what I'd do.