^^^ Well when they did the original film,i'm pretty sure they didn't envisioned warrior xenos and a queen and yet Cameron change things and they became canon,no matter how upset some people were during production and after. The same with the xeno in Alien 3 who gets the traits from the host,another change, but hey,it's now canon.
Scott mixed things again,you may disagree with him, but it's irrelevant,cause once the movie was launched , the jockey being a humanoid became canon also.
And hey, i believe they played with the idea even during the first movie. Those murals depicting the xeno lifecycle with humanoid looking jockeys with helmet type heads didn't materialise out of thin air