Hello !
Your commentary reminds me of my thoughts when I built this Bird . Funny how things return to mind isn't it .Now where ya gonna put it when it,s done .? Plus , You are a step or two ahead of where I could help .
When I did mine and realized the wing problem coming up , I created wing supports all along the upper and lower edges with Brass pins .This helped relieve the problem of poor fit . T.B.