Previous comment got me thinking. From memory, the Nie21 married the 11/16 fuselage with the N17 wings.
I haven't got the CSM N21 kit, but does this not mean that Edgar has a Nie11 fuselage already in production.
Thus the plastic bits for a complete Nie11/16 kit would just need new wings produced, would it not?
If this is the case, I'd suggest a CSM quality Nieuport Bebe would be a winner, for not too much work. (The existing SH is a bit of a dog as is, apparently, the A-Model too.)
Sandy