Update on my repairs; This one turned out exactly how I need it, but the other one is still loose (likely because I had to drill it to get the old peg out) so I'm putting a bit of paint on the other end of the joint.
I'm concerned about this because it's EXACTLY why it broke last time.