Nice work Bob. Those end/edge guards look really good. Also, to me, gluing first then adding the nails sounds like a good idea, And would add additional strength to those pieces.
Wood End Plates to the Butt Stock: If the two original long nails are still good, they could be re-used. You...