Wood glue will be fine for most of it. If it were mine I would use 30 or 45 minute epoxy on the firewall. Be sure you are gluing to a clean surface on the edges of the firewall and the mating surfaces on the firewall; remove all of the old glue that you can so that you are gluing to wood.

You did good if you reduced your prop pitch from something more than 6". For most of the trainers I have seen a 6 or even a 5 is best, especially when it comes time to get them slowed to land. The flatter prop will give you a little more thrust at low speeds when you need it too, like when you go around from a bad landing approach.

I have a Sig LT-40 with a 12-4. Plenty of thrust, but not too fast when the new guys try it.

Larry