I would just repair it the same way you did last time. The only reason your previous repair failed was because of a crash.I do like to mix some binder in with my epoxy for strength along seams. I use colloidal silica but chopped fiberglass works well also.
The wing? I would cut a small slit and wick in some thin CA to strengthen that spot.