Looks like a neat conversion set Chris. I'm not sure that being able to swap out folded/spread wings will work very well though - I think there'd be a noticeable gap/joint at the roots if the wing inner sections are not properly fitted, and this would also affect the overall look of the finished model, and probably the 'sit' of the folded wings tool.
You could, of course, have one wing folded, and the other 'spread'.