Looks like a nice kit, much better than their original, early 1980's offering, despite that fiddly part.
No doubt, with a bit (OK, maybe a lot) of fettling, you'll get it sorted. Seems the early windscreen part fits better OOB, and the later version will probably behave if you give it a good talking to !