I would add a gusset to the sleeves of the button down shirt. The fabric doesn't have to be an exact match, just as close as you can get it. If you add the gusset to the underneath seam, it won't be noticed. As for the cap sleeve shirt, I would just get fabric and make new sleeves. If budget allows, you could buy an extra shirt and cut the sleeves from that.