Have to agree with you about the top wing, it's a real pain in the a........rm.

I went the other way and fitted the wing struts first and let it set for a few days but when I fitted the fuselage struts I realised that I needed the top wing to come forward.

I had to gently pull the top wing forward without breaking the wing struts and tape it in position to get everything to line up. Nightmare but it worked. Pantherman