RE: CA hinges came loose.
When you installed the CA hinges originally, did you insert them into both the wing-trailing-edge and the aileron joints "dry"? Then you drop about 5 drops of super-thin CA into the hinge line and the glue soaks up inside the hinges and they never come loose.
Probably the medium size of replacement hinges will work for you.