I don't know, maybe you're right, but I'm still not happy with it.
It’s not a big problem to me anyway; I love the design of this toy taken as a whole.
I think they’ll actually hinge around on the legs, where there are other slots. The ones under the wings should be keep the Super Parts flat to the wings while in fighter mode.
I'm afraid they're different. See this pic from http://anymoon.com/blog/?p=4769:
The shields are also different, too many pieces are different. If a kit version ever happens I don't think it'll be like you suggest...