why not just epoxy the crap out of the wing joiner. so it's a little small, i tihnk the epoxy will be enough. as for the CA hinges, just cut a little off. as long as it's not a lot, i think you can do with a slightly smaller hinge.

my two cents.